From 8a44c62b724481110559a62912b5881254fff851 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 18 Nov 2010 12:30:29 +0000 Subject: [PATCH] different directories for each testcase --- ...e_quota_asymmetric_recv_limited_peer1.conf | 3 ++- ...e_quota_asymmetric_recv_limited_peer2.conf | 2 +- ...e_quota_asymmetric_send_limited_peer1.conf | 3 ++- ...e_quota_asymmetric_send_limited_peer2.conf | 2 +- src/core/test_core_quota_compliance.c | 19 +++++++++++++++++-- src/core/test_core_quota_peer1.conf | 4 +++- src/core/test_core_quota_peer2.conf | 2 +- 7 files changed, 27 insertions(+), 8 deletions(-) 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 2406d1aa0..4407c7294 100644 --- 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 c5566217d..1ef8ea60a 100644 --- 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 c6b35bdcc..b0234ef5d 100644 --- 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 86faf3753..de1fa205e 100644 --- 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 9e0f33522..65f28bb72 100644 --- 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 787cca89d..6519fd18e 100644 --- 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 693c509d7..88fc53d73 100644 --- 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] -- 2.25.1