tests

5 files changed, 18 insertions, 38 deletions

diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c
index 98d354bdb..593c29dcb 100644
--- a/src/regex/test_regex_eval_api.c
+++ b/src/regex/test_regex_eval_api.c
@@ -242,13 +242,7 @@ test_automaton (struct GNUNET_REGEX_Automaton *a, regex_t * rx,
 int
 main (int argc, char *argv[])
 {
-  GNUNET_log_setup ("test-regex",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
+  GNUNET_log_setup ("test-regex", "WARNING", NULL);
 
   struct GNUNET_REGEX_Automaton *a;
   regex_t rx;
diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c
index b20a6d07f..ea1c7fb78 100644
--- a/src/regex/test_regex_graph_api.c
+++ b/src/regex/test_regex_graph_api.c
@@ -77,13 +77,7 @@ filecheck (const char *filename)
 int
 main (int argc, char *argv[])
 {
-  GNUNET_log_setup ("test-regex",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
+  GNUNET_log_setup ("test-regex", "WARNING", NULL);
 
   int error;
   struct GNUNET_REGEX_Automaton *a;
diff --git a/src/regex/test_regex_iptoregex.c b/src/regex/test_regex_iptoregex.c
index 7fe1c384f..004d79041 100644
--- a/src/regex/test_regex_iptoregex.c
+++ b/src/regex/test_regex_iptoregex.c
@@ -65,13 +65,7 @@ test_iptoregex (const char *ipv4, const char *netmask, const char *expectedv4,
 int
 main (int argc, char *argv[])
 {
-  GNUNET_log_setup ("test-regex",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
+  GNUNET_log_setup ("test-regex", "WARNING", NULL);
 
   int error;
 
@@ -83,16 +77,26 @@ main (int argc, char *argv[])
                       "1111111111111111(0|1)+");
 
   error +=
+    test_iptoregex ("187.238.225.0", "255.255.255.128",
+                    "1011101111101110111000010(0|1)+", "E1E1:73F9:51BE::0", 49,
+                    "1110000111100001011100111111100101010001101111100(0|1)+");
+
+  error +=
       test_iptoregex ("255.255.255.255", "255.255.255.255",
                       "11111111111111111111111111111111",
                       "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF", 128,
-                      "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111");
+                      "11111111111111111111111111111111"
+                      "11111111111111111111111111111111"
+                      "11111111111111111111111111111111"
+                      "11111111111111111111111111111111");
 
   error +=
       test_iptoregex ("0.0.0.0", "255.255.255.255",
                       "00000000000000000000000000000000", "0::0", 128,
-                      "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
-
+                      "00000000000000000000000000000000"
+                      "00000000000000000000000000000000"
+                      "00000000000000000000000000000000"
+                      "00000000000000000000000000000000");
 
   return error;
 }
diff --git a/src/regex/test_regex_iterate_api.c b/src/regex/test_regex_iterate_api.c
index 37475ee91..8dce07615 100644
--- a/src/regex/test_regex_iterate_api.c
+++ b/src/regex/test_regex_iterate_api.c
@@ -104,13 +104,7 @@ key_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof,
 int
 main (int argc, char *argv[])
 {
-  GNUNET_log_setup ("test-regex",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
+  GNUNET_log_setup ("test-regex", "WARNING", NULL);
 
   int error;
   struct GNUNET_REGEX_Automaton *dfa;
diff --git a/src/regex/test_regex_proofs.c b/src/regex/test_regex_proofs.c
index 8ba0e142f..8ccbe00ad 100644
--- a/src/regex/test_regex_proofs.c
+++ b/src/regex/test_regex_proofs.c
@@ -152,13 +152,7 @@ test_proofs_static (void)
 int
 main (int argc, char *argv[])
 {
-  GNUNET_log_setup ("test-regex",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
+  GNUNET_log_setup ("test-regex", "WARNING", NULL);
 
   int error;