aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-09-08 11:19:06 -0400
committerNick Mathewson <nickm@torproject.org>2011-11-30 14:08:10 -0500
commitdf0da3991cb00efdf7c9362e805877e63ce8a46e (patch)
tree75c55a269b44b10338d8345d779970c8dfe33b92 /src/test/test_config.c
parent54d262a728d97a26d1e019a8cd94a679a5741e31 (diff)
downloadtor-df0da3991cb00efdf7c9362e805877e63ce8a46e.tar
tor-df0da3991cb00efdf7c9362e805877e63ce8a46e.tar.gz
No new "LEGACY" tests allowed.
Diffstat (limited to 'src/test/test_config.c')
-rw-r--r--src/test/test_config.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c
index fd38e2f7b..99d7215be 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -10,11 +10,13 @@
#include "test.h"
static void
-test_config_addressmap(void)
+test_config_addressmap(void *arg)
{
char buf[1024];
char address[256];
time_t expires = TIME_MAX;
+ (void)arg;
+
strlcpy(buf, "MapAddress .invalidwildcard.com *.torserver.exit\n" // invalid
"MapAddress *invalidasterisk.com *.torserver.exit\n" // invalid
"MapAddress *.google.com *.torserver.exit\n"
@@ -158,14 +160,11 @@ done:
;
}
-#define CONFIG_LEGACY(name) \
- { #name, legacy_test_helper, 0, &legacy_setup, test_config_ ## name }
-
#define CONFIG_TEST(name, flags) \
{ #name, test_config_ ## name, flags, NULL, NULL }
struct testcase_t config_tests[] = {
- CONFIG_LEGACY(addressmap),
+ CONFIG_TEST(addressmap, 0),
END_OF_TESTCASES
};