different directories for each testcase

diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
index 2406d1aa087386b78022a6316a7343768f707e0d..4407c72942c91506a3b8a2b10f5e79c89b6750a4 100644 (file)
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quote-peer-1/
+SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/
 DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer1.conf
 
 [resolver]
@@ -26,6 +26,7 @@ DEFAULTSERVICES =
 
 [statistics]
 PORT = 12487
+UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-statistics.sock
 #PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck
 
 [transport-tcp]

diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
index c5566217d4bb00b8a24fbb52e082ebc9fbef6b1e..1ef8ea60a4dc7a68214a7b3dafaf501f97e3f9b8 100644 (file)
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quote-peer-2/
+SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
 DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer2.conf
 
 [resolver]

diff --git a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf b/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
index c6b35bdcc2993ca778d5e80d274e2c3f8d0d294a..b0234ef5dfa08489022cd32de4095b5ad99aa426 100644 (file)
--- a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quote-peer-1/
+SERVICEHOME = /tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/
 DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer1.conf
 
 [resolver]
@@ -26,6 +26,7 @@ DEFAULTSERVICES =
 
 [statistics]
 PORT = 12427
+UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-statistics.sock
 #PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck
 
 [transport-tcp]

diff --git a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf b/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
index 86faf3753186792873f8ca6e1461c249e607b94a..de1fa205ef9000a4855908895a15bba096f748a1 100644 (file)
--- a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quote-peer-2/
+SERVICEHOME = /tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/
 DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer2.conf
 
 [resolver]

diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index 9e0f33522432157b5d8e4acef028002ce441ed19..65f28bb72bc67ded55db2270b5a460c46cc0e5bd 100644 (file)
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -733,8 +733,23 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2");
+  if (test == SYMMETRIC)
+    {
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-1/");
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-2/");
+    }
+  else if (test == ASYMMETRIC_SEND_LIMITED)
+    {
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/");
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/");
+    }
+  else if (test == ASYMMETRIC_RECV_LIMITED)
+    {
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/");
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/");
+    }
+
+
 
   return ret;
 }

diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf
index 787cca89d32a181c9e15f32c411405a9d1c451c6..6519fd18e1ad839fea442de88081cb5d93165406 100644 (file)
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/core/test_core_quota_peer1.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quote-peer-1/
+SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/
 DEFAULTCONFIG = test_core_quota_peer1.conf
 
 [resolver]
@@ -25,7 +25,9 @@ DEFAULTSERVICES =
 #GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
 
 [statistics]
+UNIXPATH = /tmp/gnunet-core-sym-p1-service-statistics.sock
 PORT = 12477
+
 #PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck
 
 [transport-tcp]

diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf
index 693c509d78af2980a5843c935f70e76583657403..88fc53d731cf51def50f61256c4a3676119a01f2 100644 (file)
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/core/test_core_quota_peer2.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quote-peer-2/
+SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/
 DEFAULTCONFIG = test_core_quota_peer2.conf
 
 [resolver]