From: Matthias Wachs <wachs@net.in.tum.de>
Date: Thu, 2 Dec 2010 13:43:38 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: initial-import-from-subversion-38251~19557
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ad4cc7a5b1d6d79b4582456e136458cc36479cd7;p=oweals%2Fgnunet.git

---

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index f05b3cb5d..5bf57b8be 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -82,6 +82,8 @@ static int is_http;
 
 static int is_https;
 
+static int is_multi_protocol;
+
 static  GNUNET_SCHEDULER_TaskIdentifier die_task;
 
 static char * key_file_p1;
@@ -351,6 +353,11 @@ run (void *cls,
       setup_peer (&p1, "test_transport_api_udp_peer1.conf");
       setup_peer (&p2, "test_transport_api_udp_peer2.conf");
     }
+  if (is_multi_protocol)
+    {
+      setup_peer (&p1, "test_transport_api_multi_peer1.conf");
+      setup_peer (&p2, "test_transport_api_multi_peer2.conf");
+    }
   else if (is_tcp)
     {
       setup_peer (&p1, "test_transport_api_tcp_peer1.conf");
@@ -561,10 +568,24 @@ main (int argc, char *argv[])
     {
       is_http = GNUNET_YES;
     }
+  else if (strstr(argv[0], "multi") != NULL)
+    {
+       is_multi_protocol = GNUNET_YES;
+    }
+
 
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
+  if (is_multi_protocol)
+  {
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-multi-peer-1/");
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-multi-peer-2/");
+  }
+  else
+  {
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
+  }
+
   return ret;
 }