diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/test.h | 6 | ||||
-rw-r--r-- | src/test/test_addr.c | 4 | ||||
-rw-r--r-- | src/test/test_confparse.c | 2 | ||||
-rw-r--r-- | src/test/test_connection.c | 2 | ||||
-rw-r--r-- | src/test/test_controller.c | 2 | ||||
-rw-r--r-- | src/test/test_crypto.c | 2 | ||||
-rw-r--r-- | src/test/test_crypto_slow.c | 2 | ||||
-rw-r--r-- | src/test/test_dir.c | 2 | ||||
-rw-r--r-- | src/test/test_entrynodes.c | 2 | ||||
-rw-r--r-- | src/test/test_link_handshake.c | 2 | ||||
-rw-r--r-- | src/test/test_options.c | 2 | ||||
-rw-r--r-- | src/test/test_util.c | 4 |
12 files changed, 16 insertions, 16 deletions
diff --git a/src/test/test.h b/src/test/test.h index e9caef3fec..feaa13a3a5 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -65,7 +65,7 @@ tt_assert_test_fmt_type(a,b,#a" "#op" "#b,int64_t,(val1_ op val2_), \ int64_t, "%"PRId64, \ {print_ = (int64_t) value_;}, {}, TT_EXIT_TEST_FUNCTION) -#endif +#endif /* !defined(COCCI) */ /** * Declare that the test is done, even though no tt___op() calls were made. @@ -164,7 +164,7 @@ void free_pregenerated_keys(void); NULL, \ NULL, \ } -#endif +#endif /* !defined(COCCI) */ #define NS(name) US_CONCAT_3_(NS_MODULE, NS_SUBMODULE, name) #define NS_FULL(module, submodule, name) US_CONCAT_3_(module, submodule, name) @@ -175,7 +175,7 @@ void free_pregenerated_keys(void); extern int CALLED(mock_fn); \ static retval NS(mock_fn) args; int CALLED(mock_fn) = 0 #define NS_MOCK(name) MOCK(name, NS(name)) -#endif +#endif /* !defined(COCCI) */ #define NS_UNMOCK(name) UNMOCK(name) extern const struct testcase_setup_t passthrough_setup; diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 44f3cd9ec1..04380d1ccf 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -70,7 +70,7 @@ test_addr_basic(void *arg) TT_EXIT_TEST_FUNCTION \ ); \ STMT_END -#endif +#endif /* !defined(COCCI) */ /** Helper: Assert that two strings both decode as IPv6 addresses with * tor_inet_pton(), and both decode to the same address. */ @@ -138,7 +138,7 @@ test_addr_basic(void *arg) TT_DIE(("Failed: tor_addr_compare_masked(%s,%s,%d) %s 0", \ a, b, m, #op)); \ STMT_END -#endif +#endif /* !defined(COCCI) */ /** Helper: assert that <b>xx</b> is parseable as a masked IPv6 address with * ports by tor_parse_mask_addr_ports(), with family <b>f</b>, IP address diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index 33979813fd..206fe0fc0a 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -1044,7 +1044,7 @@ test_confparse_find_option_name(void *arg) #define BADVAL_TEST(name) \ { "badval_" #name, test_confparse_assign_badval, 0, \ &passthrough_setup, (void*)&bv_ ## name } -#endif +#endif /* !defined(COCCI) */ struct testcase_t confparse_tests[] = { CONFPARSE_TEST(init, 0), diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 3148c1af66..0d28276702 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -888,7 +888,7 @@ test_failed_orconn_tracker(void *arg) /* where arg is an expression (constant, variable, compound expression) */ #define CONNECTION_TESTCASE_ARG(name, fork, setup, arg) \ { #name "_" #arg, test_conn_##name, fork, &setup, (void *)arg } -#endif +#endif /* !defined(COCCI) */ struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), diff --git a/src/test/test_controller.c b/src/test/test_controller.c index c68e35ab3b..793696c474 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -130,7 +130,7 @@ test_controller_parse_cmd(void *arg) { &syntax, \ ARRAY_LENGTH(array), \ array } -#endif +#endif /* !defined(COCCI) */ static const parser_testcase_t one_to_three_tests[] = { ERR("", "Need at least 1 argument(s)"), diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index ae9c51e00a..2c57e50a4c 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -2982,7 +2982,7 @@ test_crypto_failure_modes(void *arg) #define ED25519_TEST(name, fl) \ ED25519_TEST_ONE(name, (fl), "donna"), \ ED25519_TEST_ONE(name, (fl), "ref10") -#endif +#endif /* !defined(COCCI) */ struct testcase_t crypto_tests[] = { CRYPTO_LEGACY(formats), diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c index 4f0cfbc641..9ee7b100b3 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -595,7 +595,7 @@ test_crypto_ed25519_fuzz_donna(void *arg) #define ED25519_TEST(name, fl) \ ED25519_TEST_ONE(name, (fl), "donna"), \ ED25519_TEST_ONE(name, (fl), "ref10") -#endif +#endif /* !defined(COCCI) */ struct testcase_t slow_crypto_tests[] = { CRYPTO_LEGACY(s2k_rfc2440), diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 77cc1f97b4..02988d2471 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -7220,7 +7220,7 @@ test_dir_format_versions_list(void *arg) /* where arg is a string constant */ #define DIR_ARG(name,flags,arg) \ { #name "_" arg, test_dir_##name, (flags), &passthrough_setup, (void*) arg } -#endif +#endif /* !defined(COCCI) */ struct testcase_t dir_tests[] = { DIR_LEGACY(nicknames), diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 598babe22b..dec7874c7d 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -3062,7 +3062,7 @@ static const struct testcase_setup_t upgrade_circuits = { &upgrade_circuits, (void*)(arg REASONABLY_FUTURE) }, \ { #name "_reasonably_past", test_entry_guard_ ## name, TT_FORK, \ &upgrade_circuits, (void*)(arg REASONABLY_PAST) } -#endif +#endif /* !defined(COCCI) */ struct testcase_t entrynodes_tests[] = { NO_PREFIX_TEST(node_preferred_orport), diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index 1371e1ef74..18c1700031 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -1528,7 +1528,7 @@ AUTHENTICATE_FAIL(missing_ed_auth, #define TEST_AUTHENTICATE_ED(name) \ { "authenticate/" #name "_ed25519" , test_link_handshake_auth_ ## name, \ TT_FORK, &setup_authenticate, (void*)3 } -#endif +#endif /* !defined(COCCI) */ struct testcase_t link_handshake_tests[] = { TEST_RSA(certs_ok, TT_FORK), diff --git a/src/test/test_options.c b/src/test/test_options.c index aeb5de210a..6b6a52ae83 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -696,7 +696,7 @@ test_options_validate__logs(void *ignored) tt_int_op(ret, OP_EQ, -1); #else tt_int_op(ret, OP_EQ, 0); -#endif +#endif /* defined(_WIN32) */ free_options_test_data(tdata); tdata = get_options_test_data(""); diff --git a/src/test/test_util.c b/src/test/test_util.c index 09978a13c9..3e4975fcd8 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -317,7 +317,7 @@ test_util_write_chunks_to_file(void *arg) _TFE(a, b, tm_min ); \ _TFE(a, b, tm_sec ); \ TT_STMT_END -#endif +#endif /* !defined(COCCI) */ static void test_util_time(void *arg) @@ -6284,7 +6284,7 @@ test_util_map_anon_nofork(void *arg) { "compress_dos/" #name, test_util_decompress_dos, 0, \ &compress_setup, \ (char*)(identifier) } -#endif +#endif /* !defined(COCCI) */ #ifdef _WIN32 #define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL } |