[tor-commits] [tor/master] No new "LEGACY" tests allowed.

nickm at torproject.org nickm at torproject.org
Wed Nov 30 19:10:01 UTC 2011


commit df0da3991cb00efdf7c9362e805877e63ce8a46e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 8 11:19:06 2011 -0400

    No new "LEGACY" tests allowed.
---
 src/test/test_config.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index fd38e2f..99d7215 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
 };
 





More information about the tor-commits mailing list