diff options
| author | George Kadianakis <desnacked@riseup.net> | 2021-04-19 17:38:16 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2021-04-19 17:38:16 +0300 |
| commit | 7080e748e5a1d1ba2fe0b7d084394eb6743a5c8e (patch) | |
| tree | a2866f9ea916331f8fb10c3d08c2827062288a20 /src | |
| parent | 874d2c8601146a0982bb16a8e6307da9a874b640 (diff) | |
| parent | 8b22c80f5638f8d5381b9cf145f24d8f71852f10 (diff) | |
| download | tor-7080e748e5a1d1ba2fe0b7d084394eb6743a5c8e.tar.gz tor-7080e748e5a1d1ba2fe0b7d084394eb6743a5c8e.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/364'
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/test_connection.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 9c726c07f8..87940f71e6 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -992,12 +992,12 @@ test_conn_describe(void *arg) #define STR(x) #x /* where arg is an expression (constant, variable, compound expression) */ -#define CONNECTION_TESTCASE_ARG(name, fork, setup, arg) \ - { #name "_" STR(x), \ +#define CONNECTION_TESTCASE_ARG(name, extra, fork, setup, arg) \ + { STR(name)"/"extra, \ test_conn_##name, \ - fork, \ - &setup, \ - (void *)arg } + (fork), \ + &(setup), \ + (void *)(arg) } #endif /* !defined(COCCI) */ static const unsigned int PROXY_CONNECT_ARG = PROXY_CONNECT; @@ -1007,14 +1007,14 @@ struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), CONNECTION_TESTCASE(get_rsrc, TT_FORK, test_conn_get_rsrc_st), - CONNECTION_TESTCASE_ARG(download_status, TT_FORK, + CONNECTION_TESTCASE_ARG(download_status, "microdesc", TT_FORK, test_conn_download_status_st, "microdesc"), - CONNECTION_TESTCASE_ARG(download_status, TT_FORK, + CONNECTION_TESTCASE_ARG(download_status, "ns", TT_FORK, test_conn_download_status_st, "ns"), - CONNECTION_TESTCASE_ARG(https_proxy_connect, TT_FORK, + CONNECTION_TESTCASE_ARG(https_proxy_connect, "https", TT_FORK, test_conn_proxy_connect_st, &PROXY_CONNECT_ARG), - CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, TT_FORK, + CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, "haproxy", TT_FORK, test_conn_proxy_connect_st, &PROXY_HAPROXY_ARG), //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), |