diff options
-rwxr-xr-x | src/dht/dhtu_testbed_connect.sh | 8 | ||||
-rw-r--r-- | src/dht/dhtu_testbed_deploy.conf | 2 | ||||
-rwxr-xr-x | src/dht/dhtu_testbed_deploy.sh | 11 | ||||
-rwxr-xr-x | src/dht/test_dht_tools.sh | 5 | ||||
-rw-r--r-- | src/gns/test_dns2gns.conf | 2 | ||||
-rw-r--r-- | src/gns/test_gns_lookup.conf | 2 | ||||
-rw-r--r-- | src/gns/test_gns_lookup_peer1.conf | 2 | ||||
-rw-r--r-- | src/gns/test_gns_lookup_peer2.conf | 2 | ||||
-rw-r--r-- | src/gns/test_gns_proxy.conf | 2 | ||||
-rwxr-xr-x | src/gns/test_proxy.sh | 17 | ||||
-rw-r--r-- | src/statistics/test_gnunet_statistics.py.in | 13 | ||||
-rw-r--r-- | src/transport/test_transport_api2_tcp_node1.conf | 6 | ||||
-rw-r--r-- | src/transport/test_transport_api2_tcp_node2.conf | 4 | ||||
-rw-r--r-- | src/transport/test_transport_api2_tcp_peer1.conf | 4 | ||||
-rw-r--r-- | src/transport/test_transport_api2_tcp_peer2.conf | 4 |
15 files changed, 51 insertions, 33 deletions
diff --git a/src/dht/dhtu_testbed_connect.sh b/src/dht/dhtu_testbed_connect.sh index daf6f34cf..b0ba474bf 100755 --- a/src/dht/dhtu_testbed_connect.sh +++ b/src/dht/dhtu_testbed_connect.sh | |||
@@ -3,17 +3,19 @@ | |||
3 | 3 | ||
4 | set -eu | 4 | set -eu |
5 | 5 | ||
6 | GNUNET_TMP="$(gnunet-config -f -s PATHS -o GNUNET_TMP)" | ||
7 | |||
6 | # Helper script for dhtu_testbed_deploy.sh. | 8 | # Helper script for dhtu_testbed_deploy.sh. |
7 | # Do not invoke directly. | 9 | # Do not invoke directly. |
8 | 10 | ||
9 | n=$1 | 11 | n=$1 |
10 | CFG="/tmp/deployment/${n}.conf" | 12 | CFG="$GNUNET_TMP/deployment/${n}.conf" |
11 | HELLO=`gnunet-dht-hello -c $CFG` | 13 | HELLO=`gnunet-dht-hello -c $CFG` |
12 | 14 | ||
13 | # Create dense topology: | 15 | # Create dense topology: |
14 | #for OFF in `seq 1 $MAX` | 16 | #for OFF in `seq 1 $MAX` |
15 | #do | 17 | #do |
16 | # TCFG="/tmp/deployment/${OFF}.conf" | 18 | # TCFG="$GNUNET_TMP/deployment/${OFF}.conf" |
17 | # gnunet-dht-hello -c $TCFG $HELLO | 19 | # gnunet-dht-hello -c $TCFG $HELLO |
18 | #done | 20 | #done |
19 | #exit 0 | 21 | #exit 0 |
@@ -26,7 +28,7 @@ do | |||
26 | for M in `seq $R $R $END` | 28 | for M in `seq $R $R $END` |
27 | do | 29 | do |
28 | OFF=`expr \( $n + $M \) % $MAX` | 30 | OFF=`expr \( $n + $M \) % $MAX` |
29 | TCFG="/tmp/deployment/${OFF}.conf" | 31 | TCFG="$GNUNET_TMP/deployment/${OFF}.conf" |
30 | gnunet-dht-hello -c $TCFG $HELLO | 32 | gnunet-dht-hello -c $TCFG $HELLO |
31 | done | 33 | done |
32 | R=`expr $R + 1` | 34 | R=`expr $R + 1` |
diff --git a/src/dht/dhtu_testbed_deploy.conf b/src/dht/dhtu_testbed_deploy.conf index 59d69894a..efabd97d3 100644 --- a/src/dht/dhtu_testbed_deploy.conf +++ b/src/dht/dhtu_testbed_deploy.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | # with peers using the IP underlay. | 4 | # with peers using the IP underlay. |
5 | 5 | ||
6 | [paths] | 6 | [paths] |
7 | GNUNET_DATA_HOME=/tmp/%N% | 7 | GNUNET_DATA_HOME=$GNUNET_TMP/%N% |
8 | 8 | ||
9 | [dht] | 9 | [dht] |
10 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dht-%N%.sock | 10 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dht-%N%.sock |
diff --git a/src/dht/dhtu_testbed_deploy.sh b/src/dht/dhtu_testbed_deploy.sh index 648da7313..e8ac8d5d1 100755 --- a/src/dht/dhtu_testbed_deploy.sh +++ b/src/dht/dhtu_testbed_deploy.sh | |||
@@ -1,6 +1,9 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is in the public domain. | 2 | # This file is in the public domain. |
3 | 3 | ||
4 | # Getting location for temporary files | ||
5 | GNUNET_TMP="$(gnunet-config -f -s PATHS -o GNUNET_TMP)" | ||
6 | |||
4 | # We will use UDP ports above this number. | 7 | # We will use UDP ports above this number. |
5 | MINPORT=10000 | 8 | MINPORT=10000 |
6 | 9 | ||
@@ -54,13 +57,13 @@ MAX=`expr $1 - 1` | |||
54 | export GNUNET_FORCE_LOG="dht*;;;;DEBUG" | 57 | export GNUNET_FORCE_LOG="dht*;;;;DEBUG" |
55 | 58 | ||
56 | echo -n "Starting $1 peers " | 59 | echo -n "Starting $1 peers " |
57 | mkdir -p /tmp/deployment | 60 | mkdir -p "$GNUNET_TMP/deployment" |
58 | for n in `seq 0 $MAX` | 61 | for n in `seq 0 $MAX` |
59 | do | 62 | do |
60 | PORT=`expr $MINPORT + $n` | 63 | PORT=`expr $MINPORT + $n` |
61 | CFG="/tmp/deployment/${n}.conf" | 64 | CFG="$GNUNET_TMP/deployment/${n}.conf" |
62 | cat dhtu_testbed_deploy.conf | sed -e "s/%N%/$PORT/" > $CFG | 65 | cat dhtu_testbed_deploy.conf | sed -e "s/%N%/$PORT/" > $CFG |
63 | gnunet-service-dht -c $CFG -L DEBUG &> /tmp/deployment/$n.log & | 66 | gnunet-service-dht -c $CFG -L DEBUG &> "$GNUNET_TMP/deployment/$n.log" & |
64 | echo -n "." | 67 | echo -n "." |
65 | done | 68 | done |
66 | 69 | ||
@@ -85,7 +88,7 @@ fi | |||
85 | 88 | ||
86 | echo "" | 89 | echo "" |
87 | echo "Network ready. Press ENTER to terminate the testbed!" | 90 | echo "Network ready. Press ENTER to terminate the testbed!" |
88 | echo "Interact with peers using '-c /tmp/deployment/\$N.conf'" | 91 | echo "Interact with peers using '-c $GNUNET_TMP/deployment/\$N.conf'" |
89 | 92 | ||
90 | read | 93 | read |
91 | 94 | ||
diff --git a/src/dht/test_dht_tools.sh b/src/dht/test_dht_tools.sh index 56cc99e15..462866f87 100755 --- a/src/dht/test_dht_tools.sh +++ b/src/dht/test_dht_tools.sh | |||
@@ -1,8 +1,9 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # This file is in the public domain. | 2 | # This file is in the public domain. |
3 | 3 | ||
4 | out=`mktemp /tmp/test-gnunet-dht-logXXXXXXXX` | 4 | GNUNET_TMP="$(gnunet-config -f -s PATHS -o GNUNET_TMP)" |
5 | tempcfg=`mktemp /tmp/test-dht-tools.XXXXXXXX` | 5 | out=`mktemp $GNUNET_TMP/test-gnunet-dht-logXXXXXXXX` |
6 | tempcfg=`mktemp $GNUNET_TMP/test-dht-tools.XXXXXXXX` | ||
6 | checkout="check.out" | 7 | checkout="check.out" |
7 | armexe="gnunet-arm -c $tempcfg " | 8 | armexe="gnunet-arm -c $tempcfg " |
8 | putexe="gnunet-dht-put -c $tempcfg " | 9 | putexe="gnunet-dht-put -c $tempcfg " |
diff --git a/src/gns/test_dns2gns.conf b/src/gns/test_dns2gns.conf index 3b034f8d5..f484d4114 100644 --- a/src/gns/test_dns2gns.conf +++ b/src/gns/test_dns2gns.conf | |||
@@ -22,7 +22,7 @@ DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 | |||
22 | 22 | ||
23 | [namestore] | 23 | [namestore] |
24 | IMMEDIATE_START = YES | 24 | IMMEDIATE_START = YES |
25 | #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/ns_log | 25 | #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/ns_log |
26 | 26 | ||
27 | [revocation] | 27 | [revocation] |
28 | WORKBITS = 1 | 28 | WORKBITS = 1 |
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf index db0b4bfbe..01f94cf2d 100644 --- a/src/gns/test_gns_lookup.conf +++ b/src/gns/test_gns_lookup.conf | |||
@@ -20,7 +20,7 @@ ZONE_PUBLISH_TIME_WINDOW = 1 h | |||
20 | DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 | 20 | DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 |
21 | 21 | ||
22 | [namestore] | 22 | [namestore] |
23 | #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/ns_log | 23 | #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/ns_log |
24 | 24 | ||
25 | [revocation] | 25 | [revocation] |
26 | WORKBITS = 2 | 26 | WORKBITS = 2 |
diff --git a/src/gns/test_gns_lookup_peer1.conf b/src/gns/test_gns_lookup_peer1.conf index 1cf0ba628..69e2f0973 100644 --- a/src/gns/test_gns_lookup_peer1.conf +++ b/src/gns/test_gns_lookup_peer1.conf | |||
@@ -24,7 +24,7 @@ DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 | |||
24 | 24 | ||
25 | [namestore] | 25 | [namestore] |
26 | IMMEDIATE_START = YES | 26 | IMMEDIATE_START = YES |
27 | #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/ns_log | 27 | #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/ns_log |
28 | 28 | ||
29 | [revocation] | 29 | [revocation] |
30 | WORKBITS = 1 | 30 | WORKBITS = 1 |
diff --git a/src/gns/test_gns_lookup_peer2.conf b/src/gns/test_gns_lookup_peer2.conf index 2e861ff0a..3de81d7f3 100644 --- a/src/gns/test_gns_lookup_peer2.conf +++ b/src/gns/test_gns_lookup_peer2.conf | |||
@@ -29,7 +29,7 @@ DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 | |||
29 | 29 | ||
30 | [namestore] | 30 | [namestore] |
31 | IMMEDIATE_START = YES | 31 | IMMEDIATE_START = YES |
32 | #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/ns_log | 32 | #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/ns_log |
33 | 33 | ||
34 | [revocation] | 34 | [revocation] |
35 | WORKBITS = 1 | 35 | WORKBITS = 1 |
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf index 3b21f1d90..db6cb6a4c 100644 --- a/src/gns/test_gns_proxy.conf +++ b/src/gns/test_gns_proxy.conf | |||
@@ -15,7 +15,7 @@ DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 | |||
15 | 15 | ||
16 | 16 | ||
17 | [gns-proxy] | 17 | [gns-proxy] |
18 | PROXY_CACERT = /tmp/proxy_cacert.pem | 18 | PROXY_CACERT = $GNUNET_TMP/proxy_cacert.pem |
19 | PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock | 19 | PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock |
20 | 20 | ||
21 | [namestore] | 21 | [namestore] |
diff --git a/src/gns/test_proxy.sh b/src/gns/test_proxy.sh index ee288413f..720fe643d 100755 --- a/src/gns/test_proxy.sh +++ b/src/gns/test_proxy.sh | |||
@@ -1,9 +1,11 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is in the public domain. | 2 | # This file is in the public domain. |
3 | TEST_DOMAIN="www.test" | 3 | TEST_DOMAIN="www.test" |
4 | GNUNET_TMP="$(gnunet-config -f -s PATHS -o GNUNET_TMP)" | ||
5 | PROXY_CACERT="$(gnunet-config -f -c test_gnunet_proxy.conf -s gns-proxy -o PROXY_CACERT)" | ||
4 | 6 | ||
5 | # Delete old files before starting test | 7 | # Delete old files before starting test |
6 | rm -rf /tmp/gnunet/test-gnunet-gns-testing/ | 8 | rm -rf "$GNUNET_TMP/test-gnunet-gns-testing/" |
7 | gnunet-arm -s -c test_gns_proxy.conf | 9 | gnunet-arm -s -c test_gns_proxy.conf |
8 | gnunet-gns-proxy-setup-ca -c test_gns_proxy.conf | 10 | gnunet-gns-proxy-setup-ca -c test_gns_proxy.conf |
9 | 11 | ||
@@ -27,8 +29,9 @@ HEXCERT=`xxd -p local.der | tr -d '\n'` | |||
27 | #echo "This is the certificate the server does use: $HEXCERT" | 29 | #echo "This is the certificate the server does use: $HEXCERT" |
28 | BOXVALUE="6 8443 52 3 0 0 $HEXCERT" | 30 | BOXVALUE="6 8443 52 3 0 0 $HEXCERT" |
29 | 31 | ||
30 | cat local.crt > /tmp/server_cacert.pem | 32 | SERVER_CACERT="$GNUNET_TMP/server_cacert.pem" |
31 | cat local.key >> /tmp/server_cacert.pem | 33 | cat local.crt > "$SERVER_CACERT" |
34 | cat local.key >> "$SERVER_CACERT" | ||
32 | 35 | ||
33 | gnunet-identity -C test -c test_gns_proxy.conf | 36 | gnunet-identity -C test -c test_gns_proxy.conf |
34 | gnunet-namestore -p -z "test" -a -n www -t A -V 127.0.0.1 -e never -c test_gns_proxy.conf | 37 | gnunet-namestore -p -z "test" -a -n www -t A -V 127.0.0.1 -e never -c test_gns_proxy.conf |
@@ -38,13 +41,13 @@ gnunet-namestore -p -z "test" -a -n www -t BOX -V "$BOXVALUE" -e never -c test_g | |||
38 | 41 | ||
39 | gnunet-arm -i gns-proxy -c test_gns_proxy.conf | 42 | gnunet-arm -i gns-proxy -c test_gns_proxy.conf |
40 | 43 | ||
41 | #gnurl --socks5-hostname 127.0.0.1:7777 https://www.test -v --cacert /tmp/proxy_cacert.pem | 44 | #gnurl --socks5-hostname 127.0.0.1:7777 "https://$TEST_DOMAIN" -v --cacert "$PROXY_CACERT" |
42 | ./test_gns_proxy -A /tmp/proxy_cacert.pem -S /tmp/server_cacert.pem -p 8443 -c test_gns_proxy.conf | 45 | ./test_gns_proxy -A "$PROXY_CACERT" -S "$SERVER_CACERT" -p 8443 -c test_gns_proxy.conf |
43 | 46 | ||
44 | RES=$? | 47 | RES=$? |
45 | 48 | ||
46 | rm /tmp/proxy_cacert.pem | 49 | rm "$PROXY_CACERT" |
47 | rm /tmp/server_cacert.pem | 50 | rm "$SERVER_CACERT" |
48 | 51 | ||
49 | gnunet-arm -e test_gns_proxy.conf | 52 | gnunet-arm -e test_gns_proxy.conf |
50 | 53 | ||
diff --git a/src/statistics/test_gnunet_statistics.py.in b/src/statistics/test_gnunet_statistics.py.in index ce277b13e..ad7e95bd1 100644 --- a/src/statistics/test_gnunet_statistics.py.in +++ b/src/statistics/test_gnunet_statistics.py.in | |||
@@ -7,6 +7,7 @@ import re | |||
7 | import subprocess | 7 | import subprocess |
8 | import time | 8 | import time |
9 | 9 | ||
10 | raw_tmp = True | ||
10 | if os.name == "nt": | 11 | if os.name == "nt": |
11 | tmp = os.getenv("TEMP") | 12 | tmp = os.getenv("TEMP") |
12 | elif None != os.environ.get("TMPDIR"): | 13 | elif None != os.environ.get("TMPDIR"): |
@@ -14,7 +15,9 @@ elif None != os.environ.get("TMPDIR"): | |||
14 | elif None != os.environ.get("TMP"): | 15 | elif None != os.environ.get("TMP"): |
15 | tmp = os.getenv("TMP") | 16 | tmp = os.getenv("TMP") |
16 | else: | 17 | else: |
17 | tmp = "/tmp" | 18 | raw_tmp = False |
19 | tmp = subprocess.check_output("gnunet-config -f -s PATHS -o GNUNET_TMP", | ||
20 | text=True) | ||
18 | 21 | ||
19 | if os.name == 'nt': | 22 | if os.name == 'nt': |
20 | st = './gnunet-statistics.exe' | 23 | st = './gnunet-statistics.exe' |
@@ -30,8 +33,14 @@ if debug: | |||
30 | run_arm += [debug.split(' ')] | 33 | run_arm += [debug.split(' ')] |
31 | 34 | ||
32 | 35 | ||
36 | if raw_tmp: | ||
37 | cleanup_path = "gnunet/test-gnunet-statistics" | ||
38 | else: | ||
39 | cleanup_path = "test-gnunet-statistics" | ||
40 | |||
41 | |||
33 | def cleanup(): | 42 | def cleanup(): |
34 | shutil.rmtree(os.path.join(tmp, "gnunet/test-gnunet-statistics"), True) | 43 | shutil.rmtree(os.path.join(tmp, cleanup_path), True) |
35 | 44 | ||
36 | 45 | ||
37 | def sub_run(args, want_stdo=True, want_stde=False, nofail=False): | 46 | def sub_run(args, want_stdo=True, want_stde=False, nofail=False): |
diff --git a/src/transport/test_transport_api2_tcp_node1.conf b/src/transport/test_transport_api2_tcp_node1.conf index b8a743a3b..d396f43d7 100644 --- a/src/transport/test_transport_api2_tcp_node1.conf +++ b/src/transport/test_transport_api2_tcp_node1.conf | |||
@@ -5,7 +5,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/ | |||
5 | [transport] | 5 | [transport] |
6 | BINARY = gnunet-service-tng | 6 | BINARY = gnunet-service-tng |
7 | PLUGINS = tcp | 7 | PLUGINS = tcp |
8 | #PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes --log-file=/tmp/vg_peer1-%p | 8 | #PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes --log-file=$GNUNET_TEST_HOME/vg_peer1-%p |
9 | UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock | 9 | UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock |
10 | 10 | ||
11 | [communicator-tcp] | 11 | [communicator-tcp] |
@@ -14,11 +14,11 @@ BINDTO = 192.168.15.1:60002 | |||
14 | DISABLE_V6 = YES | 14 | DISABLE_V6 = YES |
15 | IMMEDIATE_START = YES | 15 | IMMEDIATE_START = YES |
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p1.sock | 16 | UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p1.sock |
17 | #PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes --log-file=/tmp/vg_ctpeer1-%p | 17 | #PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes --log-file=$GNUNET_TEST_HOME/vg_ctpeer1-%p |
18 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | 18 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args |
19 | 19 | ||
20 | [communicator-udp] | 20 | [communicator-udp] |
21 | #PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes --log-file=/tmp/vg_cupeer1-%p | 21 | #PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes --log-file=$GNUNET_TEST_HOME/vg_cupeer1-%p |
22 | BINARY = gnunet-communicator-udp | 22 | BINARY = gnunet-communicator-udp |
23 | BINDTO = 192.168.15.1:60002 | 23 | BINDTO = 192.168.15.1:60002 |
24 | DISABLE_V6 = YES | 24 | DISABLE_V6 = YES |
diff --git a/src/transport/test_transport_api2_tcp_node2.conf b/src/transport/test_transport_api2_tcp_node2.conf index f94368b3f..a4557e7ea 100644 --- a/src/transport/test_transport_api2_tcp_node2.conf +++ b/src/transport/test_transport_api2_tcp_node2.conf | |||
@@ -4,7 +4,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/ | |||
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | BINARY = gnunet-service-tng | 6 | BINARY = gnunet-service-tng |
7 | #PREFIX = valgrind --log-file=/tmp/vg_peer2-%p | 7 | #PREFIX = valgrind --log-file=$GNUNET_TEST_HOME/vg_peer2-%p |
8 | UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p2.sock | 8 | UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p2.sock |
9 | 9 | ||
10 | [communicator-tcp] | 10 | [communicator-tcp] |
@@ -12,7 +12,7 @@ BINARY = gnunet-communicator-tcp | |||
12 | BINDTO = 192.168.15.2:60003 | 12 | BINDTO = 192.168.15.2:60003 |
13 | DISABLE_V6 = YES | 13 | DISABLE_V6 = YES |
14 | IMMEDIATE_START = YES | 14 | IMMEDIATE_START = YES |
15 | #PREFIX = valgrind --log-file=/tmp/vg_comm2-%p | 15 | #PREFIX = valgrind --log-file=$GNUNET_TEST_HOME/vg_comm2-%p |
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p2.sock | 16 | UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p2.sock |
17 | 17 | ||
18 | [peerstore] | 18 | [peerstore] |
diff --git a/src/transport/test_transport_api2_tcp_peer1.conf b/src/transport/test_transport_api2_tcp_peer1.conf index 745ed6887..5a21b2adb 100644 --- a/src/transport/test_transport_api2_tcp_peer1.conf +++ b/src/transport/test_transport_api2_tcp_peer1.conf | |||
@@ -5,7 +5,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/ | |||
5 | [transport] | 5 | [transport] |
6 | BINARY = gnunet-service-tng | 6 | BINARY = gnunet-service-tng |
7 | PLUGINS = tcp | 7 | PLUGINS = tcp |
8 | #PREFIX = valgrind --log-file=/tmp/vg_peer1-%p | 8 | #PREFIX = valgrind --log-file=$GNUNET_TEST_HOME/vg_peer1-%p |
9 | UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock | 9 | UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock |
10 | 10 | ||
11 | [communicator-tcp] | 11 | [communicator-tcp] |
@@ -14,7 +14,7 @@ BINDTO = 60002 | |||
14 | DISABLE_V6 = YES | 14 | DISABLE_V6 = YES |
15 | IMMEDIATE_START = YES | 15 | IMMEDIATE_START = YES |
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p1.sock | 16 | UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p1.sock |
17 | #PREFIX = valgrind --log-file=/tmp/vg_cpeer1-%p | 17 | #PREFIX = valgrind --log-file=$GNUNET_TEST_HOME/vg_cpeer1-%p |
18 | 18 | ||
19 | [peerstore] | 19 | [peerstore] |
20 | IMMEDIATE_START = YES | 20 | IMMEDIATE_START = YES |
diff --git a/src/transport/test_transport_api2_tcp_peer2.conf b/src/transport/test_transport_api2_tcp_peer2.conf index 022468bcd..e42704100 100644 --- a/src/transport/test_transport_api2_tcp_peer2.conf +++ b/src/transport/test_transport_api2_tcp_peer2.conf | |||
@@ -4,7 +4,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/ | |||
4 | 4 | ||
5 | [transport] | 5 | [transport] |
6 | BINARY = gnunet-service-tng | 6 | BINARY = gnunet-service-tng |
7 | #PREFIX = valgrind --log-file=/tmp/vg_peer2-%p | 7 | #PREFIX = valgrind --log-file=$GNUNET_TEST_HOME/vg_peer2-%p |
8 | UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p2.sock | 8 | UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p2.sock |
9 | 9 | ||
10 | [communicator-tcp] | 10 | [communicator-tcp] |
@@ -12,7 +12,7 @@ BINARY = gnunet-communicator-tcp | |||
12 | BINDTO = 60003 | 12 | BINDTO = 60003 |
13 | DISABLE_V6 = YES | 13 | DISABLE_V6 = YES |
14 | IMMEDIATE_START = YES | 14 | IMMEDIATE_START = YES |
15 | #PREFIX = valgrind --log-file=/tmp/vg_comm2-%p | 15 | #PREFIX = valgrind --log-file=$GNUNET_TEST_HOME/vg_comm2-%p |
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p2.sock | 16 | UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p2.sock |
17 | 17 | ||
18 | [peerstore] | 18 | [peerstore] |