[GNUnet-SVN] r17637 - gnunet/src/dht

[gnunet]

Author: grothoff
Date: 2011-10-20 15:25:50 +0200 (Thu, 20 Oct 2011)
New Revision: 17637

Modified:
   gnunet/src/dht/test_dht_2dtorus.c
Log:
fix

Modified: gnunet/src/dht/test_dht_2dtorus.c
===================================================================
--- gnunet/src/dht/test_dht_2dtorus.c   2011-10-20 13:17:40 UTC (rev 17636)
+++ gnunet/src/dht/test_dht_2dtorus.c   2011-10-20 13:25:50 UTC (rev 17637)
@@ -416,17 +416,9 @@
       GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
                                              "num_peers", &num_peers))
   {
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONFIGURATION_load (testing_cfg,
-                                              "test_dht_2dtorus.conf"));
-    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
-                                               "num_peers", &num_peers))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Option TESTING:NUM_PEERS is required!\n");
-      return;
-    }
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+               "Option TESTING:NUM_PEERS is required!\n");
+    return;
   }
 
   if (GNUNET_OK !=
@@ -506,9 +498,18 @@
  * Main: start test
  */
 int
-main (int argc, char *argv[])
+main (int xargc, char *xargv[])
 {
-  GNUNET_PROGRAM_run (argc, argv, "test_dht_2dtorus",
+  char *const argv[] = { "test-dht-2dtorus",
+    "-c",
+    "test_dht_2dtorus.conf",
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+
+  GNUNET_PROGRAM_run (sizeof(argv)/sizeof(char*) - 1, argv, "test_dht_2dtorus",
                       gettext_noop ("Test dht in a small 2D torus."), options,
                       &run, NULL);
 #if REMOVE_DIR