diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-11-18 12:30:29 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-11-18 12:30:29 +0000 |
commit | 8a44c62b724481110559a62912b5881254fff851 (patch) | |
tree | 5198ca1b58b57dc705c70cb37401bce0fafb1959 /src | |
parent | 189336b08e81c0c5f4aabc9063fb180ef0a346dd (diff) | |
download | gnunet-8a44c62b724481110559a62912b5881254fff851.tar.gz gnunet-8a44c62b724481110559a62912b5881254fff851.zip |
different directories for each testcase
Diffstat (limited to 'src')
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 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-core-quote-peer-1/ | 2 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/ |
3 | DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer1.conf | 3 | DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer1.conf |
4 | 4 | ||
5 | [resolver] | 5 | [resolver] |
@@ -26,6 +26,7 @@ DEFAULTSERVICES = | |||
26 | 26 | ||
27 | [statistics] | 27 | [statistics] |
28 | PORT = 12487 | 28 | PORT = 12487 |
29 | UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-statistics.sock | ||
29 | #PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck | 30 | #PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck |
30 | 31 | ||
31 | [transport-tcp] | 32 | [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 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-core-quote-peer-2/ | 2 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/ |
3 | DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer2.conf | 3 | DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer2.conf |
4 | 4 | ||
5 | [resolver] | 5 | [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 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-core-quote-peer-1/ | 2 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/ |
3 | DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer1.conf | 3 | DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer1.conf |
4 | 4 | ||
5 | [resolver] | 5 | [resolver] |
@@ -26,6 +26,7 @@ DEFAULTSERVICES = | |||
26 | 26 | ||
27 | [statistics] | 27 | [statistics] |
28 | PORT = 12427 | 28 | PORT = 12427 |
29 | UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-statistics.sock | ||
29 | #PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck | 30 | #PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck |
30 | 31 | ||
31 | [transport-tcp] | 32 | [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 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-core-quote-peer-2/ | 2 | SERVICEHOME = /tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/ |
3 | DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer2.conf | 3 | DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer2.conf |
4 | 4 | ||
5 | [resolver] | 5 | [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[]) | |||
733 | #endif | 733 | #endif |
734 | NULL); | 734 | NULL); |
735 | ret = check (); | 735 | ret = check (); |
736 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1"); | 736 | if (test == SYMMETRIC) |
737 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2"); | 737 | { |
738 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-1/"); | ||
739 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-2/"); | ||
740 | } | ||
741 | else if (test == ASYMMETRIC_SEND_LIMITED) | ||
742 | { | ||
743 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/"); | ||
744 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/"); | ||
745 | } | ||
746 | else if (test == ASYMMETRIC_RECV_LIMITED) | ||
747 | { | ||
748 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/"); | ||
749 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/"); | ||
750 | } | ||
751 | |||
752 | |||
738 | 753 | ||
739 | return ret; | 754 | return ret; |
740 | } | 755 | } |
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 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-core-quote-peer-1/ | 2 | SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/ |
3 | DEFAULTCONFIG = test_core_quota_peer1.conf | 3 | DEFAULTCONFIG = test_core_quota_peer1.conf |
4 | 4 | ||
5 | [resolver] | 5 | [resolver] |
@@ -25,7 +25,9 @@ DEFAULTSERVICES = | |||
25 | #GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck | 25 | #GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck |
26 | 26 | ||
27 | [statistics] | 27 | [statistics] |
28 | UNIXPATH = /tmp/gnunet-core-sym-p1-service-statistics.sock | ||
28 | PORT = 12477 | 29 | PORT = 12477 |
30 | |||
29 | #PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck | 31 | #PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck |
30 | 32 | ||
31 | [transport-tcp] | 33 | [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 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-core-quote-peer-2/ | 2 | SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/ |
3 | DEFAULTCONFIG = test_core_quota_peer2.conf | 3 | DEFAULTCONFIG = test_core_quota_peer2.conf |
4 | 4 | ||
5 | [resolver] | 5 | [resolver] |