-cleaning up arm test

2 files changed, 19 insertions, 28 deletions

diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 035681ba6..76aec40b6 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -58,7 +58,7 @@ mockup_service_SOURCES = \
 check_PROGRAMS = \
  test_arm_api \
  test_exponential_backoff \
- test_gnunet_service_manager
+ test_gnunet_service_arm
 
 check_SCRIPTS = \
  test_gnunet_arm.py
@@ -79,9 +79,9 @@ test_exponential_backoff_LDADD = \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
-test_gnunet_service_manager_SOURCES = \
- test_gnunet_service_manager.c
- test_gnunet_service_manager_LDADD = \
+test_gnunet_service_arm_SOURCES = \
+ test_gnunet_service_arm.c
+ test_gnunet_service_arm_LDADD = \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
diff --git a/src/arm/test_gnunet_service_manager.c b/src/arm/test_gnunet_service_arm.c
index a126a6c94..56a2747d7 100644
--- a/src/arm/test_gnunet_service_manager.c
+++ b/src/arm/test_gnunet_service_arm.c
@@ -18,8 +18,8 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file arm/test_gnunet_service_manager.c (A mockup testcase, not functionally complete)
- * @brief testcase for gnunet-service-manager.c
+ * @file arm/test_gnunet_service_arm.c 
+ * @brief testcase for gnunet-service-arm.c; tests ARM by making it start the resolver
  */
 
 #include "platform.h"
@@ -39,9 +39,6 @@
 
 static int ret = 1;
 
-
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
 static struct GNUNET_ARM_Handle *arm;
 
 
@@ -109,35 +106,24 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  cfg = c;
-  arm = GNUNET_ARM_connect (cfg, NULL);
+  arm = GNUNET_ARM_connect (c, NULL);
   GNUNET_ARM_start_service (arm, "arm",
                             GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, 
                             &arm_notify, NULL);
 }
 
 
-static void
-check ()
+int
+main (int argc, char *argv[])
 {
-  char *const argv[] = {
-    "test-gnunet-service-manager",
+  static char *const argv[] = {
+    "test-gnunet-service-arm",
     "-c", "test_arm_api_data.conf",
     NULL
   };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
+  static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                                     argv, "test-gnunet-service-manager",
-                                     "nohelp", options, &run, NULL));
-}
-
-
-int
-main (int argc, char *argv[])
-{
   char hostname[GNUNET_OS_get_hostname_max_length () + 1];
 
   if (0 != gethostname (hostname, sizeof (hostname) - 1))
@@ -155,9 +141,14 @@ main (int argc, char *argv[])
                hostname);
       return 0;
     }
-  GNUNET_log_setup ("test-gnunet-service-manager",
+  GNUNET_log_setup ("test-gnunet-service-arm",
                     "WARNING",
                     NULL);
-  check ();
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+                                     argv, "test-gnunet-service-arm",
+                                     "nohelp", options, &run, NULL));
   return ret;
 }
+
+/* end of test_gnunet_service_arm.c */