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_connection.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_connection.c')
| -rw-r--r-- | src/test/test_connection.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/test_connection.c b/src/test/test_connection.c index ebe7c6d36f..3148c1af66 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -881,12 +881,14 @@ test_failed_orconn_tracker(void *arg) ; } +#ifndef COCCI #define CONNECTION_TESTCASE(name, fork, setup) \ { #name, test_conn_##name, fork, &setup, NULL } /* 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 struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), |