[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16668 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16668 - gnunet/src/transport |
Date: |
Thu, 1 Sep 2011 11:49:18 +0200 |
Author: wachs
Date: 2011-09-01 11:49:17 +0200 (Thu, 01 Sep 2011)
New Revision: 16668
Modified:
gnunet/src/transport/test_transport_api.c
gnunet/src/transport/test_transport_api_multiaddress.c
gnunet/src/transport/test_transport_api_reliability.c
gnunet/src/transport/test_transport_api_unreliability.c
Log:
porting all tests using testing lib
Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c 2011-09-01 09:24:44 UTC (rev
16667)
+++ gnunet/src/transport/test_transport_api.c 2011-09-01 09:49:17 UTC (rev
16668)
@@ -37,7 +37,7 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
#define VERBOSE_ARM GNUNET_NO
@@ -55,6 +55,12 @@
#define MTYPE 12345
+static char *test_source;
+
+static char *test_plugin;
+
+static char *test_name;
+
static int ok;
static GNUNET_SCHEDULER_TaskIdentifier die_task;
@@ -229,6 +235,16 @@
p2 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p2, ¬ify_receive,
¬ify_connect,
¬ify_disconnect,
NULL);
+
+ if ((p1 == NULL) || (p2 == NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
+
cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb,
NULL);
}
@@ -255,8 +271,8 @@
send_task = GNUNET_SCHEDULER_NO_TASK;
ok = 1;
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-transport-api", "nohelp", options, &run, &ok);
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,
+ "nohelp", options, &run, &ok);
return ok;
}
@@ -265,8 +281,14 @@
main (int argc, char *argv[])
{
int ret;
+ int nat_res;
- GNUNET_log_setup ("test-transport-api",
+ GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source);
+ GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source,
+ &test_plugin);
+ GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
+
+ GNUNET_log_setup (test_name,
#if VERBOSE
"DEBUG",
#else
@@ -274,10 +296,8 @@
#endif
NULL);
- int nat_res;
-
- if ((strstr (argv[0], "tcp_nat") != NULL) ||
- (strstr (argv[0], "udp_nat") != NULL))
+ if ((strcmp (test_plugin, "tcp_nat") == 0) ||
+ (strcmp (test_plugin, "udp_nat") == 0))
{
nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
if (GNUNET_NO == nat_res)
@@ -292,7 +312,6 @@
"gnunet-nat-server", "file not found");
return 0;
}
-
}
GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
@@ -303,6 +322,11 @@
GNUNET_free (cfg_file_p1);
GNUNET_free (cfg_file_p2);
+ GNUNET_free (test_source);
+ GNUNET_free (test_plugin);
+ GNUNET_free (test_name);
+
+
return ret;
}
Modified: gnunet/src/transport/test_transport_api_multiaddress.c
===================================================================
--- gnunet/src/transport/test_transport_api_multiaddress.c 2011-09-01
09:24:44 UTC (rev 16667)
+++ gnunet/src/transport/test_transport_api_multiaddress.c 2011-09-01
09:49:17 UTC (rev 16668)
@@ -48,10 +48,17 @@
* How long until we give up on transmitting the message?
*/
#define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90)
#define MTYPE 12345
+static char *test_source;
+
+static char *test_plugin;
+
+static char *test_name;
+
static int ok;
static GNUNET_SCHEDULER_TaskIdentifier die_task;
@@ -244,6 +251,16 @@
p2 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p2, ¬ify_receive,
¬ify_connect,
¬ify_disconnect,
NULL);
+
+ if ((p1 == NULL) || (p2 == NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
+
cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb,
NULL);
}
@@ -280,8 +297,14 @@
main (int argc, char *argv[])
{
int ret;
+ int nat_res;
- GNUNET_log_setup ("test-transport-api",
+ GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source);
+ GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source,
+ &test_plugin);
+ GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
+
+ GNUNET_log_setup (test_name,
#if VERBOSE
"DEBUG",
#else
@@ -289,10 +312,8 @@
#endif
NULL);
- int nat_res;
-
- if ((strstr (argv[0], "tcp_nat") != NULL) ||
- (strstr (argv[0], "udp_nat") != NULL))
+ if ((strcmp (test_plugin, "tcp_nat") == 0) ||
+ (strcmp (test_plugin, "udp_nat") == 0))
{
nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
if (GNUNET_NO == nat_res)
@@ -307,7 +328,6 @@
"gnunet-nat-server", "file not found");
return 0;
}
-
}
GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
@@ -318,6 +338,11 @@
GNUNET_free (cfg_file_p1);
GNUNET_free (cfg_file_p2);
+ GNUNET_free (test_source);
+ GNUNET_free (test_plugin);
+ GNUNET_free (test_name);
+
+
return ret;
}
Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c 2011-09-01
09:24:44 UTC (rev 16667)
+++ gnunet/src/transport/test_transport_api_reliability.c 2011-09-01
09:49:17 UTC (rev 16668)
@@ -47,7 +47,7 @@
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 900)
static char *test_source;
Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c 2011-09-01
09:24:44 UTC (rev 16667)
+++ gnunet/src/transport/test_transport_api_unreliability.c 2011-09-01
09:49:17 UTC (rev 16668)
@@ -50,6 +50,12 @@
*/
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 900)
+static char *test_source;
+
+static char *test_plugin;
+
+static char *test_name;
+
static int ok;
static GNUNET_SCHEDULER_TaskIdentifier die_task;
@@ -118,12 +124,12 @@
char *value_name;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stopping peers\n");
delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
fprintf (stderr, "\nThroughput was %llu kb/s\n",
total_bytes * 1000 / 1024 / delta);
- GNUNET_asprintf (&value_name, "unreliable_%s", test_name);
+ GNUNET_asprintf (&value_name, "unreliable_%s", test_plugin);
GAUGER ("TRANSPORT", value_name, (int) (total_bytes * 1000 / 1024 / delta),
"kb/s");
GNUNET_free (value_name);
@@ -435,6 +441,15 @@
¬ify_connect,
¬ify_disconnect,
NULL);
+ if ((p1 == NULL) || (p2 == NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
+
GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL);
}
@@ -458,9 +473,8 @@
#endif
ok = GNUNET_SYSERR;
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-transport-api-unreliability", "nohelp", options,
- &run, &ok);
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,
+ "nohelp", options, &run, &ok);
return ok;
}
@@ -471,7 +485,12 @@
int ret;
int nat_res;
- GNUNET_log_setup ("test-transport-api-unreliability",
+ GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source);
+ GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source,
+ &test_plugin);
+ GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
+
+ GNUNET_log_setup (test_name,
#if VERBOSE
"DEBUG",
#else
@@ -479,41 +498,9 @@
#endif
NULL);
- char *pch = strdup (argv[0]);
- char *backup = pch;
- char *filename = NULL;
- char *dotexe;
- char *src_name = strdup (__FILE__);
- char *split = NULL;
-
- /* get executable filename */
- pch = strtok (pch, "/");
- while (pch != NULL)
+ if ((strcmp (test_plugin, "tcp_nat") == 0) ||
+ (strcmp (test_plugin, "udp_nat") == 0))
{
- pch = strtok (NULL, "/");
- if (pch != NULL)
- filename = pch;
- }
- /* remove "lt-" */
- filename = strstr (filename, "tes");
- if (NULL != (dotexe = strstr (filename, ".exe")))
- dotexe[0] = '\0';
-
- split = strstr (src_name, ".");
- if (split != NULL)
- {
- split[0] = '\0';
- test_name = strdup (&filename[strlen (src_name) + 1]);
- }
- else
- test_name = NULL;
-
- GNUNET_free (src_name);
- GNUNET_free (backup);
-
- if ((strstr (argv[0], "tcp_nat") != NULL) ||
- (strstr (argv[0], "udp_nat") != NULL))
- {
nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
if (GNUNET_NO == nat_res)
{
@@ -537,7 +524,9 @@
GNUNET_free (cfg_file_p1);
GNUNET_free (cfg_file_p2);
- GNUNET_free_non_null (test_name);
+ GNUNET_free (test_source);
+ GNUNET_free (test_plugin);
+ GNUNET_free (test_name);
return ret;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16668 - gnunet/src/transport,
gnunet <=