aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-09 10:26:23 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-09 10:26:23 +0000
commitd0a9f269aa6575253b1c284d594a467e6fdeb7c7 (patch)
tree21cf2183b906bd550eff83616552097c977ad530 /src/integration-tests
parentd4baeee37d09e53b5f176398a1b4aaa0aa747883 (diff)
downloadgnunet-d0a9f269aa6575253b1c284d594a467e6fdeb7c7.tar.gz
gnunet-d0a9f269aa6575253b1c284d594a467e6fdeb7c7.zip
more work towards XDG spec (#3000) -- config file location
Diffstat (limited to 'src/integration-tests')
-rw-r--r--src/integration-tests/confs/c_bootstrap_server.conf2
-rw-r--r--src/integration-tests/confs/c_nat_client.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client_2.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http_2.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix_2.conf2
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp.conf2
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp.conf2
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp_http.conf2
-rw-r--r--src/integration-tests/confs/test_defaults.conf12
12 files changed, 17 insertions, 17 deletions
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 40653542e..08b08762d 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -2,7 +2,7 @@
2 2
3 3
4[PATHS] 4[PATHS]
5SERVICEHOME = /tmp/c_bootstrap_server/ 5GNUNET_TEST_HOME = /tmp/c_bootstrap_server/
6 6
7[PEER] 7[PEER]
8PRIVATE_KEY = hostkeys/c_bootstrap_server 8PRIVATE_KEY = hostkeys/c_bootstrap_server
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index cee8b98cc..5f42f22e1 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -50,7 +50,7 @@ UNIXPATH = /tmp/test-service-peerinfo-52
50PORT = 20067 50PORT = 20067
51 51
52[PATHS] 52[PATHS]
53SERVICEHOME = /tmp/c_nat_client 53GNUNET_TEST_HOME = /tmp/c_nat_client
54 54
55[PEER] 55[PEER]
56PRIVATE_KEY = hostkeys/c_nat_client 56PRIVATE_KEY = hostkeys/c_nat_client
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index f254bcdd8..87daeb41d 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -1,7 +1,7 @@
1@INLINE@ confs/test_defaults.conf 1@INLINE@ confs/test_defaults.conf
2 2
3[PATHS] 3[PATHS]
4SERVICEHOME = /tmp/c_no_nat_client/ 4GNUNET_TEST_HOME = /tmp/c_no_nat_client/
5 5
6[PEER] 6[PEER]
7PRIVATE_KEY = hostkeys/c_no_nat_client 7PRIVATE_KEY = hostkeys/c_no_nat_client
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index d399079e1..46f0ddd24 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -73,7 +73,7 @@ UNIXPATH = /tmp/test-service-statistics-30
73PORT = 20037 73PORT = 20037
74 74
75[PATHS] 75[PATHS]
76SERVICEHOME = /tmp/c_no_nat_client_2/ 76GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
77DEFAULTCONFIG = c_no_nat_client_2.conf 77DEFAULTCONFIG = c_no_nat_client_2.conf
78 78
79[PEER] 79[PEER]
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf
index d720b7ecd..67ed37ea6 100644
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http.conf
@@ -74,7 +74,7 @@ UNIXPATH = /tmp/test-service-statistics-16
74PORT = 20019 74PORT = 20019
75 75
76[PATHS] 76[PATHS]
77SERVICEHOME = /tmp/c_no_nat_client/ 77GNUNET_TEST_HOME = /tmp/c_no_nat_client/
78DEFAULTCONFIG = c_no_nat_client_http.conf 78DEFAULTCONFIG = c_no_nat_client_http.conf
79 79
80[template] 80[template]
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf
index 0e4abd3d0..a581d7f02 100644
--- a/src/integration-tests/confs/c_no_nat_client_http_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf
@@ -76,7 +76,7 @@ UNIXPATH = /tmp/test-service-statistics-30
76PORT = 20037 76PORT = 20037
77 77
78[PATHS] 78[PATHS]
79SERVICEHOME = /tmp/c_no_nat_client_2/ 79GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
80DEFAULTCONFIG = c_no_nat_client_http_2.conf 80DEFAULTCONFIG = c_no_nat_client_http_2.conf
81 81
82[template] 82[template]
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf
index bd6208ed3..c1129b519 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -79,7 +79,7 @@ UNIXPATH = /tmp/test-service-statistics-16
79PORT = 20019 79PORT = 20019
80 80
81[PATHS] 81[PATHS]
82SERVICEHOME = /tmp/c_no_nat_client/ 82GNUNET_TEST_HOME = /tmp/c_no_nat_client/
83DEFAULTCONFIG = c_no_nat_client_unix.conf 83DEFAULTCONFIG = c_no_nat_client_unix.conf
84 84
85[template] 85[template]
diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
index 724f4fb7e..f4d91d336 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
@@ -76,7 +76,7 @@ UNIXPATH = /tmp/test-service-statistics-30
76PORT = 20037 76PORT = 20037
77 77
78[PATHS] 78[PATHS]
79SERVICEHOME = /tmp/c_no_nat_client_2/ 79GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
80DEFAULTCONFIG = c_no_nat_client_unix_2.conf 80DEFAULTCONFIG = c_no_nat_client_unix_2.conf
81 81
82[template] 82[template]
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
index 204e7ffd2..ca8d684cc 100644
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp.conf
@@ -45,7 +45,7 @@ USE_INCLUDED_HELLOS = YES
45PORT = 20067 45PORT = 20067
46 46
47[PATHS] 47[PATHS]
48SERVICEHOME = /tmp/c_normal_client 48GNUNET_TEST_HOME = /tmp/c_normal_client
49 49
50[nse] 50[nse]
51UNIXPATH = /tmp/test-service-nse-54 51UNIXPATH = /tmp/test-service-nse-54
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
index 6abaf5917..5aaf8ee51 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
@@ -49,7 +49,7 @@ USE_INCLUDED_HELLOS = YES
49PORT = 20067 49PORT = 20067
50 50
51[PATHS] 51[PATHS]
52SERVICEHOME = /tmp/c_normal_client 52GNUNET_TEST_HOME = /tmp/c_normal_client
53 53
54[nse] 54[nse]
55UNIXPATH = /tmp/test-service-nse-54 55UNIXPATH = /tmp/test-service-nse-54
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
index 8b3b2b663..7b01fc9a3 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
@@ -52,7 +52,7 @@ USE_INCLUDED_HELLOS = YES
52PORT = 20067 52PORT = 20067
53 53
54[PATHS] 54[PATHS]
55SERVICEHOME = /tmp/c_normal_client 55GNUNET_TEST_HOME = /tmp/c_normal_client
56 56
57[nse] 57[nse]
58UNIXPATH = /tmp/test-service-nse-54 58UNIXPATH = /tmp/test-service-nse-54
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index 7da40e583..b1f3c33be 100644
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -30,7 +30,7 @@ PORT = 20070
30[datastore] 30[datastore]
31UNIX_MATCH_UID = YES 31UNIX_MATCH_UID = YES
32QUOTA = 100 MB 32QUOTA = 100 MB
33BLOOMFILTER = $SERVICEHOME/fs/bloomfilter 33BLOOMFILTER = $GNUNET_TEST_HOME/fs/bloomfilter
34 34
35[dhtcache] 35[dhtcache]
36DATABASE = sqlite 36DATABASE = sqlite
@@ -47,11 +47,11 @@ INTERNAL_ADDRESS = 127.0.0.1
47BINDTO = 127.0.0.1 47BINDTO = 127.0.0.1
48 48
49[fs] 49[fs]
50INDEXDB = $SERVICEHOME/idxinfo.lst 50INDEXDB = $GNUNET_TEST_HOME/idxinfo.lst
51IDENTITY_DIR = $SERVICEHOME/identities/ 51IDENTITY_DIR = $GNUNET_TEST_HOME/identities/
52STATE_DIR = $SERVICEHOME/persistence/ 52STATE_DIR = $GNUNET_TEST_HOME/persistence/
53UPDATE_DIR = $SERVICEHOME/updates/ 53UPDATE_DIR = $GNUNET_TEST_HOME/updates/
54TRUST = $SERVICEHOME/data/credit/ 54TRUST = $GNUNET_TEST_HOME/data/credit/
55 55
56[transport] 56[transport]
57PLUGINS = tcp 57PLUGINS = tcp
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 11:36:59 +0000