diff options
author | teor <teor@torproject.org> | 2019-10-24 10:00:47 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-10-24 10:00:47 +1000 |
commit | 20606b8a15483b1709dac48fd44f758e292607b8 (patch) | |
tree | 74aec1e696fe6e5eb32e7a8d8251d812e4541865 /src/test/test_dir.c | |
parent | 9586ae178a38436e07278f141801208c04b37191 (diff) | |
parent | 931a5db2a7ded73ddd72cb6646b506d49782f3ec (diff) | |
download | tor-20606b8a15483b1709dac48fd44f758e292607b8.tar.gz tor-20606b8a15483b1709dac48fd44f758e292607b8.zip |
Merge remote-tracking branch 'tor-github/pr/1447'
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 73a25dfed9..23fad2e59f 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -7209,6 +7209,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 } @@ -7218,6 +7219,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 /* !defined(COCCI) */ struct testcase_t dir_tests[] = { DIR_LEGACY(nicknames), |