aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_options.c
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-24 10:00:47 +1000
committerteor <teor@torproject.org>2019-10-24 10:00:47 +1000
commit20606b8a15483b1709dac48fd44f758e292607b8 (patch)
tree74aec1e696fe6e5eb32e7a8d8251d812e4541865 /src/test/test_options.c
parent9586ae178a38436e07278f141801208c04b37191 (diff)
parent931a5db2a7ded73ddd72cb6646b506d49782f3ec (diff)
downloadtor-20606b8a15483b1709dac48fd44f758e292607b8.tar.gz
tor-20606b8a15483b1709dac48fd44f758e292607b8.zip
Merge remote-tracking branch 'tor-github/pr/1447'
Diffstat (limited to 'src/test/test_options.c')
-rw-r--r--src/test/test_options.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c
index cecb369669..67c0821cfc 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -678,7 +678,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("");
@@ -4049,8 +4049,10 @@ test_options_init_logs_quiet(void *arg)
UNMOCK(add_file_log);
}
+#ifndef COCCI
#define LOCAL_VALIDATE_TEST(name) \
{ "validate__" #name, test_options_validate__ ## name, TT_FORK, NULL, NULL }
+#endif
struct testcase_t options_tests[] = {
{ "validate", test_options_validate, TT_FORK, NULL, NULL },