[GNUnet-SVN] r14131 - gnunet/src/core

[gnunet]

Author: nevans
Date: 2011-01-10 11:53:56 +0100 (Mon, 10 Jan 2011)
New Revision: 14131

Modified:
   gnunet/src/core/test_core_api_send_to_self.c
Log:
proper testcase functioning

Modified: gnunet/src/core/test_core_api_send_to_self.c
===================================================================
--- gnunet/src/core/test_core_api_send_to_self.c        2011-01-10 10:44:46 UTC 
(rev 14130)
+++ gnunet/src/core/test_core_api_send_to_self.c        2011-01-10 10:53:56 UTC 
(rev 14131)
@@ -178,6 +178,7 @@
                                         "-c", "test_core_api_peer1.conf", 
NULL);
 
   GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_load (core_cfg, 
"test_core_api_peer1.conf"));
+
   core = GNUNET_CORE_connect (core_cfg,
                              42,
                              NULL,
@@ -188,16 +189,19 @@
   die_task = 
GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
 60), &cleanup, cls);
 }
 
-/**
- * The main function to obtain template from gnunetd.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
+
+static int
+check ()
 {
+  char *const argv[] = { "test-core-api-send-to-self",
+    "-c",
+    "test_core_api_data.conf",
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
@@ -205,11 +209,33 @@
   ret = 1;
 
   return (GNUNET_OK ==
-         GNUNET_PROGRAM_run (argc,
+         GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                              argv,
                              "test_core_api_send_to_self",
                              gettext_noop ("help text"),
                              options, &run, NULL)) ? ret : 1;
 }
 
+/**
+ * The main function to obtain template from gnunetd.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *argv[])
+{
+  GNUNET_log_setup ("test-core-api-send-to-self",
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  ret = check ();
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
+  return ret;
+}
+
 /* end of test_core_api_send_to_self.c */