moving code to generate cfg name used in every test to testing lib

6 files changed, 74 insertions, 52 deletions

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 365b833da..15f490947 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -233,6 +233,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                                NULL);
 }
 
+
 static int
 check ()
 {
@@ -273,30 +274,8 @@ main (int argc, char *argv[])
 #endif
                     NULL);
 
-  char *pch = strdup (argv[0]);
-  char *backup = pch;
-  char *filename = NULL;
-  char *dotexe;
   int nat_res;
 
-  /* get executable filename */
-  pch = strtok (pch, "/");
-  while (pch != NULL)
-  {
-    pch = strtok (NULL, "/");
-    if (pch != NULL)
-      filename = pch;
-  }
-  /* remove "lt-" */
-  filename = strstr (filename, "tes");
-  if (NULL != (dotexe = strstr (filename, ".exe")))
-    dotexe[0] = '\0';
-
-  /* create cfg filename */
-  GNUNET_asprintf (&cfg_file_p1, "%s_peer1.conf", filename);
-  GNUNET_asprintf (&cfg_file_p2, "%s_peer2.conf", filename);
-  GNUNET_free (backup);
-
   if ((strstr (argv[0], "tcp_nat") != NULL) ||
       (strstr (argv[0], "udp_nat") != NULL))
   {
@@ -315,6 +294,10 @@ main (int argc, char *argv[])
     }
 
   }
+
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2);
+
   ret = check ();
 
   GNUNET_free (cfg_file_p1);
diff --git a/src/transport/test_transport_api_multiaddress.c b/src/transport/test_transport_api_multiaddress.c
index 1dc16dd01..8204610d7 100644
--- a/src/transport/test_transport_api_multiaddress.c
+++ b/src/transport/test_transport_api_multiaddress.c
@@ -289,30 +289,8 @@ main (int argc, char *argv[])
 #endif
                     NULL);
 
-  char *pch = strdup (argv[0]);
-  char *backup = pch;
-  char *filename = NULL;
-  char *dotexe;
   int nat_res;
 
-  /* get executable filename */
-  pch = strtok (pch, "/");
-  while (pch != NULL)
-  {
-    pch = strtok (NULL, "/");
-    if (pch != NULL)
-      filename = pch;
-  }
-  /* remove "lt-" */
-  filename = strstr (filename, "tes");
-  if (NULL != (dotexe = strstr (filename, ".exe")))
-    dotexe[0] = '\0';
-
-  /* create cfg filename */
-  GNUNET_asprintf (&cfg_file_p1, "%s_peer1.conf", filename);
-  GNUNET_asprintf (&cfg_file_p2, "%s_peer2.conf", filename);
-  GNUNET_free (backup);
-
   if ((strstr (argv[0], "tcp_nat") != NULL) ||
       (strstr (argv[0], "udp_nat") != NULL))
   {
@@ -331,6 +309,10 @@ main (int argc, char *argv[])
     }
 
   }
+
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2);
+
   ret = check ();
 
   GNUNET_free (cfg_file_p1);
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 8f48008a6..55db67877 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -436,10 +436,6 @@ main (int argc, char *argv[])
   if (NULL != (dotexe = strstr (filename, ".exe")))
     dotexe[0] = '\0';
 
-  /* create cfg filename */
-  GNUNET_asprintf (&cfg_file_p1, "%s_peer1.conf", filename);
-  GNUNET_asprintf (&cfg_file_p2, "%s_peer2.conf", filename);
-
   split = strstr (src_name, ".");
   if (split != NULL)
   {
@@ -469,10 +465,15 @@ main (int argc, char *argv[])
       return 0;
     }
   }
+
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2);
+
   ret = check ();
 
   GNUNET_free (cfg_file_p1);
   GNUNET_free (cfg_file_p2);
+
   GNUNET_free_non_null (test_name);
 
   return ret;
diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c
index 020d8614e..6f6f481fc 100644
--- a/src/transport/test_transport_api_unreliability.c
+++ b/src/transport/test_transport_api_unreliability.c
@@ -499,10 +499,6 @@ main (int argc, char *argv[])
   if (NULL != (dotexe = strstr (filename, ".exe")))
     dotexe[0] = '\0';
 
-  /* create cfg filename */
-  GNUNET_asprintf (&cfg_file_p1, "%s_peer1.conf", filename);
-  GNUNET_asprintf (&cfg_file_p2, "%s_peer2.conf", filename);
-
   split = strstr (src_name, ".");
   if (split != NULL)
   {
@@ -532,10 +528,15 @@ main (int argc, char *argv[])
       return 0;
     }
   }
+
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2);
+
   ret = check ();
 
   GNUNET_free (cfg_file_p1);
   GNUNET_free (cfg_file_p2);
+
   GNUNET_free_non_null (test_name);
 
   return ret;
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 162024eb4..3ee471453 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -341,5 +341,45 @@ void GNUNET_TRANSPORT_TESTING_connect_peers_cancel
   GNUNET_free (cc);
 }
 
+/*
+ * Some utility functions
+ */
+
+/**
+ * this function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
+ * if existing ".exe"-prefix and adds the peer-number
+ * @param file filename of the test, e.g. argv[0]
+ * @param cfgname where to write the result
+ * @param count peer number
+ */
+void
+GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, char **cfgname,
+                                          int count)
+{
+  char *pch = strdup (file);
+  char *backup = pch;
+  char *filename = NULL;
+  char *dotexe;
+
+
+  /* get executable filename */
+  pch = strtok (pch, "/");
+  while (pch != NULL)
+  {
+    pch = strtok (NULL, "/");
+    if (pch != NULL)
+      filename = pch;
+  }
+  /* remove "lt-" */
+  filename = strstr (filename, "tes");
+  if (NULL != (dotexe = strstr (filename, ".exe")))
+    dotexe[0] = '\0';
+
+  /* create cfg filename */
+  GNUNET_asprintf (cfgname, "%s_peer%u.conf", filename, count);
+
+  GNUNET_free (backup);
+}
+
 
 /* end of transport_testing.h */
diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h
index 3e5486eb7..7899279dc 100644
--- a/src/transport/transport-testing.h
+++ b/src/transport/transport-testing.h
@@ -118,4 +118,19 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext *p1,
 void
 GNUNET_TRANSPORT_TESTING_connect_peers_cancel (void *cc);
 
+/*
+ * Some utility functions
+ */
+
+/**
+ * this function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
+ * if existing ".exe"-prefix and adds the peer-number
+ * @param file filename of the test, e.g. argv[0]
+ * @param cfgname where to write the result
+ * @param count peer number
+ */
+void
+GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, char **cfgname,
+                                          int count);
+
 /* end of transport_testing.h */