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_entrynodes.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_entrynodes.c')
| -rw-r--r-- | src/test/test_entrynodes.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index d59b1c7153..dec7874c7d 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -3039,6 +3039,7 @@ static const struct testcase_setup_t upgrade_circuits = { upgrade_circuits_setup, upgrade_circuits_cleanup }; +#ifndef COCCI #define NO_PREFIX_TEST(name) \ { #name, test_ ## name, 0, NULL, NULL } @@ -3061,6 +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 /* !defined(COCCI) */ struct testcase_t entrynodes_tests[] = { NO_PREFIX_TEST(node_preferred_orport), |