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_controller.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_controller.c')
-rw-r--r-- | src/test/test_controller.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/test_controller.c b/src/test/test_controller.c index 8d9c3e8eaf..793696c474 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -120,6 +120,7 @@ test_controller_parse_cmd(void *arg) control_cmd_args_free(result); } +#ifndef COCCI #define OK(inp, out) \ { inp "\r\n", out, NULL } #define ERR(inp, err) \ @@ -129,6 +130,7 @@ test_controller_parse_cmd(void *arg) { &syntax, \ ARRAY_LENGTH(array), \ array } +#endif /* !defined(COCCI) */ static const parser_testcase_t one_to_three_tests[] = { ERR("", "Need at least 1 argument(s)"), @@ -1953,9 +1955,11 @@ test_getinfo_md_all(void *arg) return; } +#ifndef COCCI #define PARSER_TEST(type) \ { "parse/" #type, test_controller_parse_cmd, 0, &passthrough_setup, \ (void*)&parse_ ## type ## _params } +#endif struct testcase_t controller_tests[] = { PARSER_TEST(one_to_three), |