[GNUnet-SVN] r24058 - gnunet/src/regex

[gnunet]

Author: szengel
Date: 2012-09-27 16:11:42 +0200 (Thu, 27 Sep 2012)
New Revision: 24058

Modified:
   gnunet/src/regex/test_regex_eval_api.c
   gnunet/src/regex/test_regex_graph_api.c
   gnunet/src/regex/test_regex_iptoregex.c
   gnunet/src/regex/test_regex_iterate_api.c
   gnunet/src/regex/test_regex_proofs.c
Log:
tests

Modified: gnunet/src/regex/test_regex_eval_api.c
===================================================================
--- gnunet/src/regex/test_regex_eval_api.c      2012-09-27 14:06:37 UTC (rev 
24057)
+++ gnunet/src/regex/test_regex_eval_api.c      2012-09-27 14:11:42 UTC (rev 
24058)
@@ -242,13 +242,7 @@
 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;

Modified: gnunet/src/regex/test_regex_graph_api.c
===================================================================
--- gnunet/src/regex/test_regex_graph_api.c     2012-09-27 14:06:37 UTC (rev 
24057)
+++ gnunet/src/regex/test_regex_graph_api.c     2012-09-27 14:11:42 UTC (rev 
24058)
@@ -77,13 +77,7 @@
 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;

Modified: gnunet/src/regex/test_regex_iptoregex.c
===================================================================
--- gnunet/src/regex/test_regex_iptoregex.c     2012-09-27 14:06:37 UTC (rev 
24057)
+++ gnunet/src/regex/test_regex_iptoregex.c     2012-09-27 14:11:42 UTC (rev 
24058)
@@ -65,13 +65,7 @@
 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 @@
                       "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;
 }

Modified: gnunet/src/regex/test_regex_iterate_api.c
===================================================================
--- gnunet/src/regex/test_regex_iterate_api.c   2012-09-27 14:06:37 UTC (rev 
24057)
+++ gnunet/src/regex/test_regex_iterate_api.c   2012-09-27 14:11:42 UTC (rev 
24058)
@@ -104,13 +104,7 @@
 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;

Modified: gnunet/src/regex/test_regex_proofs.c
===================================================================
--- gnunet/src/regex/test_regex_proofs.c        2012-09-27 14:06:37 UTC (rev 
24057)
+++ gnunet/src/regex/test_regex_proofs.c        2012-09-27 14:11:42 UTC (rev 
24058)
@@ -152,13 +152,7 @@
 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;