aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-12-17 15:44:13 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-12-17 15:44:13 +0000
commitaba51a8fe1f22b62ce735a725e2badc4f21b21d0 (patch)
tree2eeafbb032bfed2a533fa1aa80210d7590f2652e /src/integration-tests
parent117cebae893dff6b1a41c0686affb4d485a1e754 (diff)
downloadgnunet-aba51a8fe1f22b62ce735a725e2badc4f21b21d0.tar.gz
gnunet-aba51a8fe1f22b62ce735a725e2badc4f21b21d0.zip
remove unused config files
Diffstat (limited to 'src/integration-tests')
-rw-r--r--src/integration-tests/Makefile.am9
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http.conf94
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http_2.conf94
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix.conf104
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix_2.conf95
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp.conf63
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp_http.conf66
7 files changed, 0 insertions, 525 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 708b878c9..87540efa0 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -112,15 +112,6 @@ EXTRA_DIST = \
112 confs/c_nat_client.conf \ 112 confs/c_nat_client.conf \
113 confs/c_no_nat_client_2.conf \ 113 confs/c_no_nat_client_2.conf \
114 confs/c_no_nat_client.conf \ 114 confs/c_no_nat_client.conf \
115 confs/c_normal_client_tcp.conf \
116 confs/c_normal_client_tcp_udp.conf \
117 confs/c_normal_client_tcp_udp_http.conf \
118 confs/c_no_nat_client_http.conf \
119 confs/c_no_nat_client_http_2.conf\
120 confs/c_no_nat_client_http.conf \
121 confs/c_no_nat_client_http_2.conf \
122 confs/c_no_nat_client_unix.conf \
123 confs/c_no_nat_client_unix_2.conf \
124 hostkeys/c_bootstrap_server \ 115 hostkeys/c_bootstrap_server \
125 hostkeys/c_no_nat_client \ 116 hostkeys/c_no_nat_client \
126 hostkeys/c_no_nat_client_2 \ 117 hostkeys/c_no_nat_client_2 \
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf
deleted file mode 100644
index 8f1f776a5..000000000
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ /dev/null
@@ -1,94 +0,0 @@
1[arm]
2DEFAULTSERVICES = topology hostlist fs core
3UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
4PORT = 20022
5
6[dns]
7UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
8
9[lockmanager]
10AUTOSTART = YES
11
12[core]
13UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
14PORT = 20021
15
16[ats]
17UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23
18PORT = 20030
19
20[mesh]
21UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27
22PORT = 20034
23
24[datastore]
25UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25
26PORT = 20032
27
28[resolver]
29UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28
30PORT = 20035
31
32[dht]
33UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15
34PORT = 20018
35
36[nat]
37BEHIND_NAT = NO
38
39[gnunet-nat-server]
40PORT = 20020
41
42[fs]
43UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
44PORT = 20023
45
46[transport]
47PLUGINS = http
48UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
49PORT = 20029
50
51[transport-tcp]
52PORT = 20028
53ADVERTISED_PORT = 20028
54
55[transport-udp]
56PORT = 20027
57
58[hostlist]
59SERVERS = http://localhost:8080/
60
61[vpn]
62UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
63
64[dv]
65UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_http_c-1
66
67[peerinfo]
68UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24
69USE_INCLUDED_HELLOS = YES
70PORT = 20031
71
72[statistics]
73UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16
74PORT = 20019
75
76[PATHS]
77GNUNET_TEST_HOME = /tmp/c_no_nat_client/
78DEFAULTCONFIG = c_no_nat_client_http.conf
79
80[template]
81PORT = 20024
82UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
83
84[nse]
85UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
86PORT = 20033
87
88[transport-http]
89PORT = 20026
90
91[transport-https]
92PORT = 20025
93
94
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
deleted file mode 100644
index c10b042f5..000000000
--- a/src/integration-tests/confs/c_no_nat_client_http_2.conf
+++ /dev/null
@@ -1,94 +0,0 @@
1@INLINE@ confs/test_defaults.conf
2
3[arm]
4DEFAULTSERVICES = topology hostlist fs core
5UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32
6PORT = 20040
7
8[dns]
9UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33
10
11[lockmanager]
12AUTOSTART = YES
13
14[core]
15UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31
16PORT = 20039
17
18[ats]
19UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37
20PORT = 20048
21
22[mesh]
23UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41
24PORT = 20052
25
26[datastore]
27UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39
28PORT = 20050
29
30[resolver]
31UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42
32PORT = 20053
33
34[dht]
35UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29
36PORT = 20036
37
38[nat]
39BEHIND_NAT = NO
40
41[gnunet-nat-server]
42PORT = 20038
43
44[fs]
45UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34
46PORT = 20041
47
48[transport]
49PLUGINS = http
50UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36
51PORT = 20047
52
53[transport-tcp]
54PORT = 20046
55ADVERTISED_PORT = 20046
56
57[transport-udp]
58PORT = 20045
59
60[hostlist]
61SERVERS = http://localhost:8080/
62
63[vpn]
64UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock
65
66[dv]
67UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_http_c-2
68
69[peerinfo]
70UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38
71USE_INCLUDED_HELLOS = YES
72PORT = 20049
73
74[statistics]
75UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30
76PORT = 20037
77
78[PATHS]
79GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
80DEFAULTCONFIG = c_no_nat_client_http_2.conf
81
82[template]
83PORT = 20042
84UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35
85
86[nse]
87UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40
88PORT = 20051
89
90[transport-http]
91PORT = 20044
92
93[transport-https]
94PORT = 20043
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf
deleted file mode 100644
index 1321b0c35..000000000
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ /dev/null
@@ -1,104 +0,0 @@
1@INLINE@ confs/test_defaults.conf
2
3[arm]
4DEFAULTSERVICES = topology hostlist fs core
5UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
6PORT = 20022
7
8[dns]
9UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
10
11[lockmanager]
12AUTOSTART = YES
13
14[core]
15UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
16PORT = 20021
17
18[ats]
19UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23
20PORT = 20030
21
22[mesh]
23UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27
24PORT = 20034
25
26[datastore]
27UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25
28PORT = 20032
29
30[resolver]
31UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28
32PORT = 20035
33
34[dht]
35UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15
36PORT = 20018
37
38[nat]
39BEHIND_NAT = NO
40
41[gnunet-nat-server]
42PORT = 20020
43
44[fs]
45UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
46PORT = 20023
47
48[transport]
49PLUGINS = unix tcp udp http
50UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
51PORT = 20029
52
53[transport-unix]
54PORT = 22087
55
56[transport-tcp]
57PORT = 20028
58ADVERTISED_PORT = 20028
59
60[transport-udp]
61PORT = 20027
62
63[hostlist]
64SERVERS = http://localhost:8080/
65
66[vpn]
67UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
68
69[dv]
70UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_unix_c-1
71
72[peerinfo]
73UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24
74USE_INCLUDED_HELLOS = YES
75PORT = 20031
76
77[statistics]
78UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16
79PORT = 20019
80
81[PATHS]
82GNUNET_TEST_HOME = /tmp/c_no_nat_client/
83DEFAULTCONFIG = c_no_nat_client_unix.conf
84
85[template]
86PORT = 20024
87UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
88
89[nse]
90UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
91PORT = 20033
92
93[gnunetd]
94HOSTKEY = hostkeys/0001-hostkey
95
96[transport-http]
97PORT = 0
98
99[transport-https]
100PORT = 20025
101
102[chat]
103UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-chat-b_no_nat_unix_c-1
104
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
deleted file mode 100644
index 67f0e0d76..000000000
--- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf
+++ /dev/null
@@ -1,95 +0,0 @@
1@INLINE@ confs/test_defaults.conf
2
3[arm]
4DEFAULTSERVICES = topology hostlist fs core
5UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32
6PORT = 20040
7
8[dns]
9UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33
10
11[lockmanager]
12AUTOSTART = YES
13
14[core]
15UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31
16PORT = 20039
17
18[ats]
19UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37
20PORT = 20048
21
22[mesh]
23UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41
24PORT = 20052
25
26[datastore]
27UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39
28PORT = 20050
29
30[resolver]
31UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42
32PORT = 20053
33
34[dht]
35UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29
36PORT = 20036
37
38[nat]
39BEHIND_NAT = NO
40
41[gnunet-nat-server]
42PORT = 20038
43
44[fs]
45UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34
46PORT = 20041
47
48[transport]
49PLUGINS = unix tcp udp http
50UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36
51PORT = 20047
52
53[transport-tcp]
54PORT = 20046
55ADVERTISED_PORT = 20046
56
57[transport-udp]
58PORT = 20045
59
60[hostlist]
61SERVERS = http://localhost:8080/
62
63[vpn]
64UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock
65
66[dv]
67UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_unix_c-2
68
69[peerinfo]
70UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38
71USE_INCLUDED_HELLOS = YES
72PORT = 20049
73
74[statistics]
75UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30
76PORT = 20037
77
78[PATHS]
79GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
80DEFAULTCONFIG = c_no_nat_client_unix_2.conf
81
82[template]
83PORT = 20042
84UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35
85
86[nse]
87UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40
88PORT = 20051
89
90[transport-http]
91PORT = 20044
92
93[transport-https]
94PORT = 20043
95
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
deleted file mode 100644
index 40757ba1b..000000000
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ /dev/null
@@ -1,63 +0,0 @@
1@INLINE@ confs/test_defaults.conf
2
3[arm]
4UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
5PORT = 20058
6
7[lockmanager]
8AUTOSTART = YES
9
10[core]
11UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45
12PORT = 20057
13
14[ats]
15UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51
16PORT = 20066
17
18[datastore]
19UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53
20PORT = 20068
21
22[resolver]
23UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56
24PORT = 20071
25
26[dht]
27UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43
28PORT = 20054
29
30[fs]
31UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
32PORT = 20059
33
34[transport]
35PLUGINS = tcp udp
36UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
37PORT = 20065
38
39[transport-tcp]
40PORT = 0
41ADVERTISED_PORT = 20064
42
43[transport-udp]
44PORT = 0
45
46[peerinfo]
47UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
48USE_INCLUDED_HELLOS = YES
49PORT = 20067
50
51[PATHS]
52GNUNET_TEST_HOME = /tmp/c_normal_client
53
54[nse]
55UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
56PORT = 20069
57
58[transport-http]
59PORT = 0
60
61[transport-https]
62PORT = 0
63
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
deleted file mode 100644
index 5a70d9d4c..000000000
--- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
+++ /dev/null
@@ -1,66 +0,0 @@
1@INLINE@ confs/test_defaults.conf
2
3[arm]
4UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
5PORT = 20058
6
7[lockmanager]
8AUTOSTART = YES
9
10[core]
11UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45
12PORT = 20057
13
14[ats]
15UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51
16PORT = 20066
17
18[datastore]
19UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53
20PORT = 20068
21
22[resolver]
23UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56
24PORT = 20071
25
26[dht]
27UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43
28PORT = 20054
29
30[fs]
31UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
32PORT = 20059
33
34[transport]
35PLUGINS = tcp udp http
36UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
37PORT = 20065
38
39[transport-tcp]
40PORT = 0
41ADVERTISED_PORT = 20064
42
43[transport-udp]
44PORT = 0
45
46[dv]
47UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_c_normal_client_tcp_udp_http
48
49[peerinfo]
50UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
51USE_INCLUDED_HELLOS = YES
52PORT = 20067
53
54[PATHS]
55GNUNET_TEST_HOME = /tmp/c_normal_client
56
57[nse]
58UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
59PORT = 20069
60
61[transport-http]
62PORT = 0
63
64[transport-https]
65PORT = 0
66