diff options
author | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:39:06 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:39:06 -0400 |
commit | b2d487ae2249a307cd23255dbb1a22241eefd6ef (patch) | |
tree | cd754fbe8d1c13264749f997f1221b1635a97e49 /src/test/test_dir.c | |
parent | 2d013bbe5cccaccf9ace0beec5a987fb80e850ad (diff) | |
parent | 7e7a4874b8fa333d1840cc5f2c0b118d6a0e7c47 (diff) | |
download | tor-b2d487ae2249a307cd23255dbb1a22241eefd6ef.tar.gz tor-b2d487ae2249a307cd23255dbb1a22241eefd6ef.zip |
Merge branch 'ticket31705_v2' into ticket31705_v2_merged
Conflicts:
src/feature/dirparse/authcert_parse.c
src/feature/dirparse/ns_parse.c
src/feature/hs/hs_service.c
src/lib/conf/conftesting.h
src/lib/log/log.h
src/lib/thread/threads.h
src/test/test_options.c
These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
Diffstat (limited to 'src/test/test_dir.c')
-rw-r--r-- | src/test/test_dir.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 6329ff7750..77cc1f97b4 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -7210,6 +7210,7 @@ test_dir_format_versions_list(void *arg) teardown_capture_of_logs(); } +#ifndef COCCI #define DIR_LEGACY(name) \ { #name, test_dir_ ## name , TT_FORK, NULL, NULL } @@ -7219,6 +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 struct testcase_t dir_tests[] = { DIR_LEGACY(nicknames), |