[GNUnet-SVN] r31484 - in gnunet/src/integration-tests: . confs

[gnunet]

Author: wachs
Date: 2013-12-17 16:44:13 +0100 (Tue, 17 Dec 2013)
New Revision: 31484

Removed:
   gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
   gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
   gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
   gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
   gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
   gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
Modified:
   gnunet/src/integration-tests/Makefile.am
Log:
remove unused config files


Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am    2013-12-17 15:41:48 UTC (rev 
31483)
+++ gnunet/src/integration-tests/Makefile.am    2013-12-17 15:44:13 UTC (rev 
31484)
@@ -112,15 +112,6 @@
    confs/c_nat_client.conf \
    confs/c_no_nat_client_2.conf \
    confs/c_no_nat_client.conf \
-   confs/c_normal_client_tcp.conf \
-   confs/c_normal_client_tcp_udp.conf \
-   confs/c_normal_client_tcp_udp_http.conf \
-   confs/c_no_nat_client_http.conf \
-   confs/c_no_nat_client_http_2.conf\
-   confs/c_no_nat_client_http.conf \
-   confs/c_no_nat_client_http_2.conf \
-   confs/c_no_nat_client_unix.conf \
-   confs/c_no_nat_client_unix_2.conf \
    hostkeys/c_bootstrap_server \
    hostkeys/c_no_nat_client \
    hostkeys/c_no_nat_client_2 \

Deleted: gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_http.conf        
2013-12-17 15:41:48 UTC (rev 31483)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_http.conf        
2013-12-17 15:44:13 UTC (rev 31484)
@@ -1,94 +0,0 @@
-[arm]
-DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
-PORT = 20022
-
-[dns]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
-
-[lockmanager]
-AUTOSTART = YES
-
-[core]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
-PORT = 20021
-
-[ats]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23
-PORT = 20030
-
-[mesh]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27
-PORT = 20034
-
-[datastore]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25
-PORT = 20032
-
-[resolver]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28
-PORT = 20035
-
-[dht]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15
-PORT = 20018
-
-[nat]
-BEHIND_NAT = NO
-
-[gnunet-nat-server]
-PORT = 20020
-
-[fs]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
-PORT = 20023
-
-[transport]
-PLUGINS = http
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
-PORT = 20029
-
-[transport-tcp]
-PORT = 20028
-ADVERTISED_PORT = 20028
-
-[transport-udp]
-PORT = 20027
-
-[hostlist]
-SERVERS = http://localhost:8080/
-
-[vpn]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
-
-[dv]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_http_c-1
-
-[peerinfo]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24
-USE_INCLUDED_HELLOS = YES
-PORT = 20031
-
-[statistics]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16
-PORT = 20019
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_no_nat_client/
-DEFAULTCONFIG = c_no_nat_client_http.conf
-
-[template]
-PORT = 20024
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
-
-[nse]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
-PORT = 20033
-
-[transport-http]
-PORT = 20026
-
-[transport-https]
-PORT = 20025
-
-

Deleted: gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf      
2013-12-17 15:41:48 UTC (rev 31483)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf      
2013-12-17 15:44:13 UTC (rev 31484)
@@ -1,94 +0,0 @@
address@hidden@ confs/test_defaults.conf
-
-[arm]
-DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32
-PORT = 20040
-
-[dns]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33
-
-[lockmanager]
-AUTOSTART = YES
-
-[core]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31
-PORT = 20039
-
-[ats]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37
-PORT = 20048
-
-[mesh]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41
-PORT = 20052
-
-[datastore]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39
-PORT = 20050
-
-[resolver]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42
-PORT = 20053
-
-[dht]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29
-PORT = 20036
-
-[nat]
-BEHIND_NAT = NO
-
-[gnunet-nat-server]
-PORT = 20038
-
-[fs]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34
-PORT = 20041
-
-[transport]
-PLUGINS = http
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36
-PORT = 20047
-
-[transport-tcp]
-PORT = 20046
-ADVERTISED_PORT = 20046
-
-[transport-udp]
-PORT = 20045
-
-[hostlist]
-SERVERS = http://localhost:8080/
-
-[vpn]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock
-
-[dv]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_http_c-2
-
-[peerinfo]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38
-USE_INCLUDED_HELLOS = YES
-PORT = 20049
-
-[statistics]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30
-PORT = 20037
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = c_no_nat_client_http_2.conf
-
-[template]
-PORT = 20042
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35
-
-[nse]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40
-PORT = 20051
-
-[transport-http]
-PORT = 20044
-
-[transport-https]
-PORT = 20043

Deleted: gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf        
2013-12-17 15:41:48 UTC (rev 31483)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf        
2013-12-17 15:44:13 UTC (rev 31484)
@@ -1,104 +0,0 @@
address@hidden@ confs/test_defaults.conf
-
-[arm]
-DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
-PORT = 20022
-
-[dns]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
-
-[lockmanager]
-AUTOSTART = YES
-
-[core]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
-PORT = 20021
-
-[ats]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23
-PORT = 20030
-
-[mesh]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27
-PORT = 20034
-
-[datastore]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25
-PORT = 20032
-
-[resolver]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28
-PORT = 20035
-
-[dht]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15
-PORT = 20018
-
-[nat]
-BEHIND_NAT = NO
-
-[gnunet-nat-server]
-PORT = 20020
-
-[fs]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
-PORT = 20023
-
-[transport]
-PLUGINS = unix tcp udp http
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
-PORT = 20029
-
-[transport-unix]
-PORT = 22087
-
-[transport-tcp]
-PORT = 20028
-ADVERTISED_PORT = 20028
-
-[transport-udp]
-PORT = 20027
-
-[hostlist]
-SERVERS = http://localhost:8080/
-
-[vpn]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
-
-[dv]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_unix_c-1
-
-[peerinfo]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24
-USE_INCLUDED_HELLOS = YES
-PORT = 20031
-
-[statistics]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16
-PORT = 20019
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_no_nat_client/
-DEFAULTCONFIG = c_no_nat_client_unix.conf
-
-[template]
-PORT = 20024
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
-
-[nse]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
-PORT = 20033
-
-[gnunetd]
-HOSTKEY = hostkeys/0001-hostkey
-
-[transport-http]
-PORT = 0
-
-[transport-https]
-PORT = 20025
-
-[chat]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-chat-b_no_nat_unix_c-1
-

Deleted: gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf      
2013-12-17 15:41:48 UTC (rev 31483)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf      
2013-12-17 15:44:13 UTC (rev 31484)
@@ -1,95 +0,0 @@
address@hidden@ confs/test_defaults.conf
-
-[arm]
-DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32
-PORT = 20040
-
-[dns]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33
-
-[lockmanager]
-AUTOSTART = YES
-
-[core]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31
-PORT = 20039
-
-[ats]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37
-PORT = 20048
-
-[mesh]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41
-PORT = 20052
-
-[datastore]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39
-PORT = 20050
-
-[resolver]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42
-PORT = 20053
-
-[dht]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29
-PORT = 20036
-
-[nat]
-BEHIND_NAT = NO
-
-[gnunet-nat-server]
-PORT = 20038
-
-[fs]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34
-PORT = 20041
-
-[transport]
-PLUGINS = unix tcp udp http
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36
-PORT = 20047
-
-[transport-tcp]
-PORT = 20046
-ADVERTISED_PORT = 20046
-
-[transport-udp]
-PORT = 20045
-
-[hostlist]
-SERVERS = http://localhost:8080/
-
-[vpn]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock
-
-[dv]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_unix_c-2
-
-[peerinfo]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38
-USE_INCLUDED_HELLOS = YES
-PORT = 20049
-
-[statistics]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30
-PORT = 20037
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = c_no_nat_client_unix_2.conf
-
-[template]
-PORT = 20042
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35
-
-[nse]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40
-PORT = 20051
-
-[transport-http]
-PORT = 20044
-
-[transport-https]
-PORT = 20043
-

Deleted: gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf     
2013-12-17 15:41:48 UTC (rev 31483)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf     
2013-12-17 15:44:13 UTC (rev 31484)
@@ -1,63 +0,0 @@
address@hidden@ confs/test_defaults.conf
-
-[arm]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
-PORT = 20058
-
-[lockmanager]
-AUTOSTART = YES
-
-[core]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45
-PORT = 20057
-
-[ats]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51
-PORT = 20066
-
-[datastore]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53
-PORT = 20068
-
-[resolver]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56
-PORT = 20071
-
-[dht]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43
-PORT = 20054
-
-[fs]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
-PORT = 20059
-
-[transport]
-PLUGINS = tcp udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
-PORT = 20065
-
-[transport-tcp]
-PORT = 0
-ADVERTISED_PORT = 20064
-
-[transport-udp]
-PORT = 0
-
-[peerinfo]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
-USE_INCLUDED_HELLOS = YES
-PORT = 20067
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_normal_client
-
-[nse]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
-PORT = 20069
-
-[transport-http]
-PORT = 0
-
-[transport-https]
-PORT = 0
-

Deleted: gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf        
2013-12-17 15:41:48 UTC (rev 31483)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf        
2013-12-17 15:44:13 UTC (rev 31484)
@@ -1,66 +0,0 @@
address@hidden@ confs/test_defaults.conf
-
-[arm]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
-PORT = 20058
-
-[lockmanager]
-AUTOSTART = YES
-
-[core]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45
-PORT = 20057
-
-[ats]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51
-PORT = 20066
-
-[datastore]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53
-PORT = 20068
-
-[resolver]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56
-PORT = 20071
-
-[dht]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43
-PORT = 20054
-
-[fs]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
-PORT = 20059
-
-[transport]
-PLUGINS = tcp udp http
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
-PORT = 20065
-
-[transport-tcp]
-PORT = 0
-ADVERTISED_PORT = 20064
-
-[transport-udp]
-PORT = 0
-
-[dv]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_c_normal_client_tcp_udp_http
-
-[peerinfo]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
-USE_INCLUDED_HELLOS = YES
-PORT = 20067
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_normal_client
-
-[nse]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
-PORT = 20069
-
-[transport-http]
-PORT = 0
-
-[transport-https]
-PORT = 0
-