[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30043 - in gnunet: . src/arm src/ats src/core src/datastor
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r30043 - in gnunet: . src/arm src/ats src/core src/datastore src/dht src/dv src/experimentation src/fs src/gns src/hostlist src/integration-tests/confs src/mesh src/namestore src/nat src/nse src/peerinfo src/peerinfo-tool src/psycstore src/pt src/regex src/set src/statistics src/testbed src/testing src/topology src/transport src/util |
|
Date: |
Wed, 9 Oct 2013 12:26:23 +0200 |
Author: grothoff
Date: 2013-10-09 12:26:23 +0200 (Wed, 09 Oct 2013)
New Revision: 30043
Modified:
gnunet/README
gnunet/src/arm/test_arm_api_data.conf
gnunet/src/ats/test_ats_api.conf
gnunet/src/ats/test_ats_mlp.conf
gnunet/src/core/test_core_api_peer1.conf
gnunet/src/core/test_core_api_peer2.conf
gnunet/src/core/test_core_api_send_to_self.conf
gnunet/src/core/test_core_defaults.conf
gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
gnunet/src/core/test_core_quota_peer1.conf
gnunet/src/core/test_core_quota_peer2.conf
gnunet/src/datastore/perf_plugin_datastore_data_heap.conf
gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf
gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf
gnunet/src/datastore/test_datastore_api_data_heap.conf
gnunet/src/datastore/test_datastore_api_data_mysql.conf
gnunet/src/datastore/test_datastore_api_data_postgres.conf
gnunet/src/datastore/test_datastore_api_data_sqlite.conf
gnunet/src/datastore/test_plugin_datastore_data_heap.conf
gnunet/src/datastore/test_plugin_datastore_data_mysql.conf
gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf
gnunet/src/dht/test_dht_2dtorus.conf
gnunet/src/dht/test_dht_api_data.conf
gnunet/src/dht/test_dht_api_peer1.conf
gnunet/src/dht/test_dht_line.conf
gnunet/src/dht/test_dht_monitor.conf
gnunet/src/dht/test_dht_multipeer.conf
gnunet/src/dv/template_dv.conf
gnunet/src/experimentation/test_experimentation_clique.conf
gnunet/src/fs/fs_test_lib_data.conf
gnunet/src/fs/perf_gnunet_service_fs_p2p.conf
gnunet/src/fs/test_fs_data.conf
gnunet/src/fs/test_fs_defaults.conf
gnunet/src/fs/test_fs_download_data.conf
gnunet/src/fs/test_fs_download_indexed.conf
gnunet/src/fs/test_fs_download_mesh.conf
gnunet/src/fs/test_fs_file_information_data.conf
gnunet/src/fs/test_fs_list_indexed_data.conf
gnunet/src/fs/test_fs_namespace_data.conf
gnunet/src/fs/test_fs_publish_data.conf
gnunet/src/fs/test_fs_search_data.conf
gnunet/src/fs/test_fs_unindex_data.conf
gnunet/src/fs/test_fs_uri_data.conf
gnunet/src/fs/test_gnunet_fs_idx_data.conf
gnunet/src/fs/test_gnunet_fs_psd_data.conf
gnunet/src/fs/test_gnunet_fs_rec_data.conf
gnunet/src/fs/test_gnunet_service_fs_migration_data.conf
gnunet/src/gns/test_gns_defaults.conf
gnunet/src/gns/test_gns_lookup.conf
gnunet/src/gns/test_gns_proxy.conf
gnunet/src/gns/test_gns_simple_lookup.conf
gnunet/src/hostlist/hostlist.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
gnunet/src/hostlist/test_hostlist_defaults.conf
gnunet/src/hostlist/test_learning_adv_peer.conf
gnunet/src/hostlist/test_learning_learn_peer.conf
gnunet/src/hostlist/test_learning_learn_peer2.conf
gnunet/src/integration-tests/confs/c_bootstrap_server.conf
gnunet/src/integration-tests/confs/c_nat_client.conf
gnunet/src/integration-tests/confs/c_no_nat_client.conf
gnunet/src/integration-tests/confs/c_no_nat_client_2.conf
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.conf
gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
gnunet/src/integration-tests/confs/test_defaults.conf
gnunet/src/mesh/test_mesh.conf
gnunet/src/mesh/test_mesh_drop.conf
gnunet/src/namestore/test_namestore_api.conf
gnunet/src/nat/test_nat_data.conf
gnunet/src/nat/test_nat_test_data.conf
gnunet/src/nse/nse_infiniband.conf
gnunet/src/nse/nse_profiler_test.conf
gnunet/src/nse/test_nse.conf
gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
gnunet/src/peerinfo/test_peerinfo_api_data.conf
gnunet/src/psycstore/test_psycstore.conf
gnunet/src/pt/test_gns_vpn.conf
gnunet/src/pt/test_gnunet_vpn.conf
gnunet/src/regex/test_regex_api_data.conf
gnunet/src/set/test_set.conf
gnunet/src/statistics/test_statistics_api_data.conf
gnunet/src/testbed/test_testbed_api.conf
gnunet/src/testbed/test_testbed_api_barriers.conf.in
gnunet/src/testbed/test_testbed_api_statistics.conf
gnunet/src/testbed/test_testbed_api_test_timeout.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
gnunet/src/testbed/test_testbed_logger_api.conf
gnunet/src/testing/test_testing_defaults.conf
gnunet/src/testing/test_testing_sharedservices.conf
gnunet/src/topology/test_gnunet_daemon_topology_data.conf
gnunet/src/topology/topology.conf
gnunet/src/transport/template_cfg_peer1.conf
gnunet/src/transport/template_cfg_peer2.conf
gnunet/src/transport/test_plugin_transport_data.conf
gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_bluetooth_peer1.conf
gnunet/src/transport/test_quota_compliance_bluetooth_peer2.conf
gnunet/src/transport/test_quota_compliance_data.conf
gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_http_peer1.conf
gnunet/src/transport/test_quota_compliance_http_peer2.conf
gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_https_peer1.conf
gnunet/src/transport/test_quota_compliance_https_peer2.conf
gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
gnunet/src/transport/test_quota_compliance_udp_peer1.conf
gnunet/src/transport/test_quota_compliance_udp_peer2.conf
gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_unix_peer1.conf
gnunet/src/transport/test_quota_compliance_unix_peer2.conf
gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_wlan_peer1.conf
gnunet/src/transport/test_quota_compliance_wlan_peer2.conf
gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
gnunet/src/transport/test_transport_api_bluetooth_peer1.conf
gnunet/src/transport/test_transport_api_bluetooth_peer2.conf
gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
gnunet/src/transport/test_transport_api_http_peer1.conf
gnunet/src/transport/test_transport_api_http_peer2.conf
gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
gnunet/src/transport/test_transport_api_https_peer1.conf
gnunet/src/transport/test_transport_api_https_peer2.conf
gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf
gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf
gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
gnunet/src/transport/test_transport_api_multi_peer1.conf
gnunet/src/transport/test_transport_api_multi_peer2.conf
gnunet/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
gnunet/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
gnunet/src/transport/test_transport_api_tcp_peer1.conf
gnunet/src/transport/test_transport_api_tcp_peer2.conf
gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf
gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf
gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf
gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf
gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
gnunet/src/transport/test_transport_api_udp_peer1.conf
gnunet/src/transport/test_transport_api_udp_peer2.conf
gnunet/src/transport/test_transport_api_unix_peer1.conf
gnunet/src/transport/test_transport_api_unix_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
gnunet/src/transport/test_transport_api_wlan_peer1.conf
gnunet/src/transport/test_transport_api_wlan_peer2.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf
gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf
gnunet/src/transport/test_transport_defaults.conf
gnunet/src/util/program.c
gnunet/src/util/service.c
gnunet/src/util/test_resolver_api_data.conf
gnunet/src/util/util.conf
Log:
more work towards XDG spec (#3000) -- config file location
Modified: gnunet/README
===================================================================
--- gnunet/README 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/README 2013-10-09 10:26:23 UTC (rev 30043)
@@ -115,8 +115,9 @@
the SERVICEHOME option in section "[PATHS]" to "/var/lib/gnunet" to
do this. Depending on your personal preferences, you may also want to
use "/etc/gnunet.conf" for the location of the configuration file in
-this case (instead of ~gnunet/.gnunet/gnunet.conf"). In this case,
-you need to start GNUnet using "gnunet-arm -s -c /etc/gnunet.conf".
+this case (instead of ~gnunet/.config/gnunet.conf"). In this case,
+you need to start GNUnet using "gnunet-arm -s -c /etc/gnunet.conf" or
+set "XDG_CONFIG_HOME=/etc/".
You can avoid running 'make install' as root if you run configure
with the "--with-sudo=yes" option and have extensive sudo rights
@@ -172,7 +173,7 @@
system-wide defaults (typically located in
$GNUNET_PREFIX/share/gnunet/config.d/) and a second one that overrides
default values with user-specific preferences. The user-specific
-configuration file should be located in "~/.gnunet/gnunet.conf" or its
+configuration file should be located in "~/.config/gnunet.conf" or its
location can be specified by giving the "-c" option to the respective
GNUnet application.
Modified: gnunet/src/arm/test_arm_api_data.conf
===================================================================
--- gnunet/src/arm/test_arm_api_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/arm/test_arm_api_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-arm/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-arm/
[arm]
PORT = 23354
Modified: gnunet/src/ats/test_ats_api.conf
===================================================================
--- gnunet/src/ats/test_ats_api.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/ats/test_ats_api.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-ats-api-scheduling/
+GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
[arm]
PORT = 12001
Modified: gnunet/src/ats/test_ats_mlp.conf
===================================================================
--- gnunet/src/ats/test_ats_mlp.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/ats/test_ats_mlp.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-ats-api-scheduling/
+GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
[arm]
PORT = 12001
Modified: gnunet/src/core/test_core_api_peer1.conf
===================================================================
--- gnunet/src/core/test_core_api_peer1.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/core/test_core_api_peer1.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-1/
[arm]
PORT = 12460
Modified: gnunet/src/core/test_core_api_peer2.conf
===================================================================
--- gnunet/src/core/test_core_api_peer2.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/core/test_core_api_peer2.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-2/
[arm]
PORT = 22460
Modified: gnunet/src/core/test_core_api_send_to_self.conf
===================================================================
--- gnunet/src/core/test_core_api_send_to_self.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/core/test_core_api_send_to_self.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-SERVICEHOME = ~/.gnunet/
+GNUNET_TEST_HOME = ~/.gnunet/
[arm]
PORT = 2425
Modified: gnunet/src/core/test_core_defaults.conf
===================================================================
--- gnunet/src/core/test_core_defaults.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/core/test_core_defaults.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core/
[arm]
DEFAULTSERVICES =
Modified: gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/
[transport-tcp]
PORT = 12488
Modified: gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
[arm]
Modified: gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/
[transport-tcp]
PORT = 12488
Modified: gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/
[arm]
PORT = 22486
Modified: gnunet/src/core/test_core_quota_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_peer1.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/core/test_core_quota_peer1.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-sym-peer-1/
[transport-tcp]
PORT = 12468
Modified: gnunet/src/core/test_core_quota_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_peer2.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/core/test_core_quota_peer2.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-sym-peer-2/
[arm]
PORT = 22476
Modified: gnunet/src/datastore/perf_plugin_datastore_data_heap.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_heap.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/perf_plugin_datastore_data_heap.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/perf-gnunet-datastore-heap/
+GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-heap/
[datastore]
Modified: gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/
+GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-mysql/
[datastore]
DATABASE = mysql
Modified: gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/
+GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-postgres/
[datastore]
DATABASE = postgres
Modified: gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,4 +1,4 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/
+GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-sqlite/
Modified: gnunet/src/datastore/test_datastore_api_data_heap.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_heap.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/test_datastore_api_data_heap.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-heap/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-heap/
[TESTING]
WEAKRANDOM = YES
Modified: gnunet/src/datastore/test_datastore_api_data_mysql.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_mysql.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/test_datastore_api_data_mysql.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-mysql/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-mysql/
[TESTING]
WEAKRANDOM = YES
Modified: gnunet/src/datastore/test_datastore_api_data_postgres.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_postgres.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/test_datastore_api_data_postgres.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-postgres/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-postgres/
[TESTING]
WEAKRANDOM = YES
Modified: gnunet/src/datastore/test_datastore_api_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_sqlite.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/test_datastore_api_data_sqlite.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-sqlite/
[TESTING]
WEAKRANDOM = YES
Modified: gnunet/src/datastore/test_plugin_datastore_data_heap.conf
===================================================================
--- gnunet/src/datastore/test_plugin_datastore_data_heap.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/test_plugin_datastore_data_heap.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-plugin-heap/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-heap/
[datastore]
DATABASE = heap
Modified: gnunet/src/datastore/test_plugin_datastore_data_mysql.conf
===================================================================
--- gnunet/src/datastore/test_plugin_datastore_data_mysql.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/test_plugin_datastore_data_mysql.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-mysql/
[datastore]
DATABASE = mysql
Modified: gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
===================================================================
--- gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-postgres/
[datastore]
DATABASE = postgres
Modified: gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,4 +1,4 @@
@INLINE@ test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-sqlite/
Modified: gnunet/src/dht/test_dht_2dtorus.conf
===================================================================
--- gnunet/src/dht/test_dht_2dtorus.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/dht/test_dht_2dtorus.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test_dht_2dtorus/
+GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/
[arm]
DEFAULTSERVICES = core dht
Modified: gnunet/src/dht/test_dht_api_data.conf
===================================================================
--- gnunet/src/dht/test_dht_api_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/dht/test_dht_api_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-dht-api/
+GNUNET_TEST_HOME = /tmp/test-dht-api/
[fs]
AUTOSTART = NO
Modified: gnunet/src/dht/test_dht_api_peer1.conf
===================================================================
--- gnunet/src/dht/test_dht_api_peer1.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/dht/test_dht_api_peer1.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -40,7 +40,7 @@
BINDTO = 127.0.0.1
[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-dht-peer-1/
[nat]
DISABLEV6 = YES
Modified: gnunet/src/dht/test_dht_line.conf
===================================================================
--- gnunet/src/dht/test_dht_line.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/dht/test_dht_line.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test_dht_line/
+GNUNET_TEST_HOME = /tmp/test_dht_line/
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
Modified: gnunet/src/dht/test_dht_monitor.conf
===================================================================
--- gnunet/src/dht/test_dht_monitor.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/dht/test_dht_monitor.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -22,7 +22,7 @@
OVERLAY_TOPOLOGY = LINE
[PATHS]
-SERVICEHOME = /tmp/test-dht-monitor/
+GNUNET_TEST_HOME = /tmp/test-dht-monitor/
[nat]
DISABLEV6 = YES
Modified: gnunet/src/dht/test_dht_multipeer.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/dht/test_dht_multipeer.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -26,10 +26,10 @@
OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-dht-multipeer/
+GNUNET_TEST_HOME = /tmp/test-dht-multipeer/
[nat]
DISABLEV6 = YES
Modified: gnunet/src/dv/template_dv.conf
===================================================================
--- gnunet/src/dv/template_dv.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/dv/template_dv.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -34,7 +34,7 @@
[transport-blacklist-93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O]
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-dv-testing/
+GNUNET_TEST_HOME = /tmp/test-gnunet-dv-testing/
[peerinfo]
USE_INCLUDED_HELLOS = NO
Modified: gnunet/src/experimentation/test_experimentation_clique.conf
===================================================================
--- gnunet/src/experimentation/test_experimentation_clique.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/experimentation/test_experimentation_clique.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -54,7 +54,7 @@
PORT = 12368
[PATHS]
-SERVICEHOME = /tmp/test-experimentation/
+GNUNET_TEST_HOME = /tmp/test-experimentation/
[dns]
AUTOSTART = NO
Modified: gnunet/src/fs/fs_test_lib_data.conf
===================================================================
--- gnunet/src/fs/fs_test_lib_data.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/fs/fs_test_lib_data.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-fs-test-lib/
+GNUNET_TEST_HOME = /tmp/gnunet-fs-test-lib/
[ats]
WAN_QUOTA_IN = 3932160
Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p.conf
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ fs_test_lib_data.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-fs-test-lib/
+GNUNET_TEST_HOME = /tmp/gnunet-fs-test-lib/
[fs]
GAUGER_HEAP = "2-peer 10 MB P2P download"
Modified: gnunet/src/fs/test_fs_data.conf
===================================================================
--- gnunet/src/fs/test_fs_data.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/fs/test_fs_data.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-data/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-data/
[fs]
ACTIVEMIGRATION = NO
Modified: gnunet/src/fs/test_fs_defaults.conf
===================================================================
--- gnunet/src/fs/test_fs_defaults.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/fs/test_fs_defaults.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-lib/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-lib/
[resolver]
PORT = 4364
Modified: gnunet/src/fs/test_fs_download_data.conf
===================================================================
--- gnunet/src/fs/test_fs_download_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/fs/test_fs_download_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-download/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/
[download-test]
# set to 'YES' to test non-anonymous download
Modified: gnunet/src/fs/test_fs_download_indexed.conf
===================================================================
--- gnunet/src/fs/test_fs_download_indexed.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/fs/test_fs_download_indexed.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-download/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/
[download-test]
# set to 'YES' to test non-anonymous download
Modified: gnunet/src/fs/test_fs_download_mesh.conf
===================================================================
--- gnunet/src/fs/test_fs_download_mesh.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/fs/test_fs_download_mesh.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-download/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/
[download-test]
# set to 'YES' to test non-anonymous download
Modified: gnunet/src/fs/test_fs_file_information_data.conf
===================================================================
--- gnunet/src/fs/test_fs_file_information_data.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/fs/test_fs_file_information_data.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-file-information/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-file-information/
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_list_indexed_data.conf
===================================================================
--- gnunet/src/fs/test_fs_list_indexed_data.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/fs/test_fs_list_indexed_data.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-list-indexed/
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_namespace_data.conf
===================================================================
--- gnunet/src/fs/test_fs_namespace_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/fs/test_fs_namespace_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-namespace/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-namespace/
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_publish_data.conf
===================================================================
--- gnunet/src/fs/test_fs_publish_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/fs/test_fs_publish_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-publish/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-publish/
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_search_data.conf
===================================================================
--- gnunet/src/fs/test_fs_search_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/fs/test_fs_search_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-search/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-search/
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_unindex_data.conf
===================================================================
--- gnunet/src/fs/test_fs_unindex_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/fs/test_fs_unindex_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-unindex/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-unindex/
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_uri_data.conf
===================================================================
--- gnunet/src/fs/test_fs_uri_data.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/fs/test_fs_uri_data.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-uri/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-uri/
[arm]
DEFAULTSERVICES = topology hostlist
Modified: gnunet/src/fs/test_gnunet_fs_idx_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_idx_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/fs/test_gnunet_fs_idx_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-py-idx/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-idx/
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_gnunet_fs_psd_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_psd_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/fs/test_gnunet_fs_psd_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-py-psd/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-psd/
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_gnunet_fs_rec_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_rec_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/fs/test_gnunet_fs_rec_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-py-rec/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-rec/
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_gnunet_service_fs_migration_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration_data.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/fs/test_gnunet_service_fs_migration_data.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-service-fs-migration/
+GNUNET_TEST_HOME = /tmp/test-gnunet-service-fs-migration/
[testbed]
OVERLAY_TOPOLOGY = CLIQUE
Modified: gnunet/src/gns/test_gns_defaults.conf
===================================================================
--- gnunet/src/gns/test_gns_defaults.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/gns/test_gns_defaults.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-gns-testing/
+GNUNET_TEST_HOME = /tmp/test-gnunet-gns-testing/
[dhtcache]
DATABASE = heap
Modified: gnunet/src/gns/test_gns_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_lookup.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/gns/test_gns_lookup.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -9,7 +9,7 @@
DEFAULTSERVICES =
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-gns-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/
[gns]
#PREFIX = valgrind --leak-check=full --track-origins=yes
Modified: gnunet/src/gns/test_gns_proxy.conf
===================================================================
--- gnunet/src/gns/test_gns_proxy.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/gns/test_gns_proxy.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-gns-proxy/
+GNUNET_TEST_HOME = /tmp/gnunet-test-gns-proxy/
[transport]
PLUGINS = tcp
@@ -15,7 +15,7 @@
[gns]
AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/.hostkey
+ZONEKEY = $GNUNET_TEST_HOME/.hostkey
HIJACK_DNS = YES
[gns-proxy]
Modified: gnunet/src/gns/test_gns_simple_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/gns/test_gns_simple_lookup.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -42,7 +42,7 @@
BINDTO = 127.0.0.1
[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-gns-peer-1/
[nat]
@@ -67,7 +67,7 @@
PRIVATE_ZONEKEY =
zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
SHORTEN_ZONE = short
SHORTEN_ZONEKEY =
zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
-#ZONEKEY = $SERVICEHOME/gns/zonekey.zkey
+#ZONEKEY = $GNUNET_TEST_HOME/gns/zonekey.zkey
HIJACK_DNS = NO
UNIXPATH = /tmp/gnunet-service-gns.sock
AUTO_IMPORT_PKEY = YES
@@ -92,7 +92,7 @@
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
DATABASE = sqlite
-ZONEFILE_DIRECTORY = $SERVICEHOME
+ZONEFILE_DIRECTORY = $GNUNET_TEST_HOME
[namestore-sqlite]
-FILENAME = $SERVICEHOME/sqlite-default.db
+FILENAME = $GNUNET_TEST_HOME/sqlite-default.db
Modified: gnunet/src/hostlist/hostlist.conf
===================================================================
--- gnunet/src/hostlist/hostlist.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/hostlist/hostlist.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,14 +1,14 @@
[hostlist]
# port for hostlist http server
HTTPPORT = 8080
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
+HOSTLISTFILE = $GNUNET_CONFIG_HOME/hostlist/learned.txt
BINARY = gnunet-daemon-hostlist
# consider having "-e" as default as well once implemented
OPTIONS = -b
SERVERS = http://v10.gnunet.org/hostlist
# http://ioerror.gnunet.org:65535/
# proxy for downloading hostlists
-HTTP-PROXY =
+HTTP-PROXY =
# bind hostlist http server to a specific IPv4 or IPv6
# BINDTOIP =
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/
[transport-tcp]
PORT = 12968
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/
[transport-tcp]
PORT = 22968
Modified: gnunet/src/hostlist/test_hostlist_defaults.conf
===================================================================
--- gnunet/src/hostlist/test_hostlist_defaults.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/hostlist/test_hostlist_defaults.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist/
[resolver]
PORT = 12464
Modified: gnunet/src/hostlist/test_learning_adv_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_adv_peer.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/hostlist/test_learning_adv_peer.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/
[transport-tcp]
PORT = 22968
Modified: gnunet/src/hostlist/test_learning_learn_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/hostlist/test_learning_learn_peer.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/
[transport-tcp]
PORT = 12968
Modified: gnunet/src/hostlist/test_learning_learn_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer2.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/hostlist/test_learning_learn_peer2.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-3/
[transport-tcp]
PORT = 32968
Modified: gnunet/src/integration-tests/confs/c_bootstrap_server.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_bootstrap_server.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_bootstrap_server.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -2,7 +2,7 @@
[PATHS]
-SERVICEHOME = /tmp/c_bootstrap_server/
+GNUNET_TEST_HOME = /tmp/c_bootstrap_server/
[PEER]
PRIVATE_KEY = hostkeys/c_bootstrap_server
Modified: gnunet/src/integration-tests/confs/c_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_nat_client.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_nat_client.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -50,7 +50,7 @@
PORT = 20067
[PATHS]
-SERVICEHOME = /tmp/c_nat_client
+GNUNET_TEST_HOME = /tmp/c_nat_client
[PEER]
PRIVATE_KEY = hostkeys/c_nat_client
Modified: gnunet/src/integration-tests/confs/c_no_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_no_nat_client.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,7 +1,7 @@
@INLINE@ confs/test_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client/
[PEER]
PRIVATE_KEY = hostkeys/c_no_nat_client
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -73,7 +73,7 @@
PORT = 20037
[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client_2/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
DEFAULTCONFIG = c_no_nat_client_2.conf
[PEER]
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -74,7 +74,7 @@
PORT = 20019
[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client/
DEFAULTCONFIG = c_no_nat_client_http.conf
[template]
Modified: 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-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -76,7 +76,7 @@
PORT = 20037
[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client_2/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
DEFAULTCONFIG = c_no_nat_client_http_2.conf
[template]
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -79,7 +79,7 @@
PORT = 20019
[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client/
DEFAULTCONFIG = c_no_nat_client_unix.conf
[template]
Modified: 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-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -76,7 +76,7 @@
PORT = 20037
[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client_2/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
DEFAULTCONFIG = c_no_nat_client_unix_2.conf
[template]
Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -45,7 +45,7 @@
PORT = 20067
[PATHS]
-SERVICEHOME = /tmp/c_normal_client
+GNUNET_TEST_HOME = /tmp/c_normal_client
[nse]
UNIXPATH = /tmp/test-service-nse-54
Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -49,7 +49,7 @@
PORT = 20067
[PATHS]
-SERVICEHOME = /tmp/c_normal_client
+GNUNET_TEST_HOME = /tmp/c_normal_client
[nse]
UNIXPATH = /tmp/test-service-nse-54
Modified: 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-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -52,7 +52,7 @@
PORT = 20067
[PATHS]
-SERVICEHOME = /tmp/c_normal_client
+GNUNET_TEST_HOME = /tmp/c_normal_client
[nse]
UNIXPATH = /tmp/test-service-nse-54
Modified: gnunet/src/integration-tests/confs/test_defaults.conf
===================================================================
--- gnunet/src/integration-tests/confs/test_defaults.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/integration-tests/confs/test_defaults.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -30,7 +30,7 @@
[datastore]
UNIX_MATCH_UID = YES
QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
+BLOOMFILTER = $GNUNET_TEST_HOME/fs/bloomfilter
[dhtcache]
DATABASE = sqlite
@@ -47,11 +47,11 @@
BINDTO = 127.0.0.1
[fs]
-INDEXDB = $SERVICEHOME/idxinfo.lst
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-TRUST = $SERVICEHOME/data/credit/
+INDEXDB = $GNUNET_TEST_HOME/idxinfo.lst
+IDENTITY_DIR = $GNUNET_TEST_HOME/identities/
+STATE_DIR = $GNUNET_TEST_HOME/persistence/
+UPDATE_DIR = $GNUNET_TEST_HOME/updates/
+TRUST = $GNUNET_TEST_HOME/data/credit/
[transport]
PLUGINS = tcp
Modified: gnunet/src/mesh/test_mesh.conf
===================================================================
--- gnunet/src/mesh/test_mesh.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/mesh/test_mesh.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-mesh/
+GNUNET_TEST_HOME = /tmp/test-mesh/
[mesh]
BINARY = gnunet-service-mesh-enc
Modified: gnunet/src/mesh/test_mesh_drop.conf
===================================================================
--- gnunet/src/mesh/test_mesh_drop.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/mesh/test_mesh_drop.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-mesh/
+GNUNET_TEST_HOME = /tmp/test-mesh/
[mesh]
#BINARY = gnunet-service-mesh
Modified: gnunet/src/namestore/test_namestore_api.conf
===================================================================
--- gnunet/src/namestore/test_namestore_api.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/namestore/test_namestore_api.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -8,7 +8,7 @@
DATABASE = sqlite
[namestore-sqlite]
-FILENAME = $SERVICEHOME/namestore/sqlite_test.db
+FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db
[namestore-postgres]
CONFIG = connect_timeout=10; dbname=gnunetcheck
Modified: gnunet/src/nat/test_nat_data.conf
===================================================================
--- gnunet/src/nat/test_nat_data.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/nat/test_nat_data.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,11 +1,11 @@
[PATHS]
-SERVICEHOME = /tmp/nat-test
-# SERVICEHOME = /var/lib/gnunet/
+GNUNET_TEST_HOME = /tmp/nat-test
+# GNUNET_TEST_HOME = /var/lib/gnunet/
# configuration file is assumed to be the default,
# which is what we want by default...
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[TESTING]
WEAKRANDOM = NO
@@ -54,7 +54,7 @@
UNIXPATH = /tmp/gnunet-service-arm.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
-# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
+# GLOBAL_POSTFIX = -l $GNUNET_TEST_HOME/{}-logs
# GLOBAL_PREFIX =
# USERNAME =
# MAXBUF =
Modified: gnunet/src/nat/test_nat_test_data.conf
===================================================================
--- gnunet/src/nat/test_nat_test_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/nat/test_nat_test_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,6 +1,6 @@
[PATHS]
-SERVICEHOME = /tmp/nat-test
-# SERVICEHOME = /var/lib/gnunet/
+GNUNET_TEST_HOME = /tmp/nat-test
+# GNUNET_TEST_HOME = /var/lib/gnunet/
# configuration file is assumed to be the default,
# which is what we want by default...
Modified: gnunet/src/nse/nse_infiniband.conf
===================================================================
--- gnunet/src/nse/nse_infiniband.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/nse/nse_infiniband.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/nse-profiler/
+GNUNET_TEST_HOME = /tmp/nse-profiler/
[testbed]
AUTOSTART = NO
@@ -25,7 +25,7 @@
WORKDELAY = 60 s
INTERVAL = 10 s
WORKBITS = 0
-PROOFFILE = $SERVICEHOME/nse.proof
+PROOFFILE = $GNUNET_TEST_HOME/nse.proof
HISTOGRAM_DIR = /home/totakura/nse/test/histograms
[arm]
Modified: gnunet/src/nse/nse_profiler_test.conf
===================================================================
--- gnunet/src/nse/nse_profiler_test.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/nse/nse_profiler_test.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/nse-profiler/
+GNUNET_TEST_HOME = /tmp/nse-profiler/
[testbed]
AUTOSTART = NO
@@ -23,7 +23,7 @@
WORKDELAY = 60 s
INTERVAL = 10 s
WORKBITS = 0
-PROOFFILE = $SERVICEHOME/nse.proof
+PROOFFILE = $GNUNET_TEST_HOME/nse.proof
[arm]
DEFAULTSERVICES = core nse
Modified: gnunet/src/nse/test_nse.conf
===================================================================
--- gnunet/src/nse/test_nse.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/nse/test_nse.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-nse-multipeer/
+GNUNET_TEST_HOME = /tmp/test-nse-multipeer/
[nse]
PORT = 22353
@@ -8,14 +8,14 @@
#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
AUTOSTART = YES
-PROOFFILE = $SERVICEHOME/proof.nse
+PROOFFILE = $GNUNET_TEST_HOME/proof.nse
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
WORKDELAY = 1 ms
INTERVAL = 60 s
WORKBITS = 1
-HISTOGRAM = $SERVICEHOME/nse-histogram
+HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram
[arm]
Modified: gnunet/src/peerinfo/test_peerinfo_api_data.conf
===================================================================
--- gnunet/src/peerinfo/test_peerinfo_api_data.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/peerinfo/test_peerinfo_api_data.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-peerinfo/
+GNUNET_TEST_HOME = /tmp/test-gnunet-peerinfo/
[peerinfo]
PORT = 22354
Modified: gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
===================================================================
--- gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-peerinfo/
+GNUNET_TEST_HOME = /tmp/gnunet-test-peerinfo/
[gnunetd]
#HOSTKEY = test_gnunet_peerinfo.hostkey
Modified: gnunet/src/psycstore/test_psycstore.conf
===================================================================
--- gnunet/src/psycstore/test_psycstore.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/psycstore/test_psycstore.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -11,4 +11,4 @@
DATABASE = sqlite
[psycstore-sqlite]
-FILENAME = $SERVICEHOME/psycstore/sqlite_test.db
+FILENAME = $GNUNET_TEST_HOME/psycstore/sqlite_test.db
Modified: gnunet/src/pt/test_gns_vpn.conf
===================================================================
--- gnunet/src/pt/test_gns_vpn.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/pt/test_gns_vpn.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-gns-vpn/
+GNUNET_TEST_HOME = /tmp/gnunet-test-gns-vpn/
[transport]
PLUGINS = tcp
@@ -47,7 +47,7 @@
[gns]
AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/.hostkey
+ZONEKEY = $GNUNET_TEST_HOME/.hostkey
HIJACK_DNS = YES
[namestore]
Modified: gnunet/src/pt/test_gnunet_vpn.conf
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/pt/test_gnunet_vpn.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/gnunet-test-vpn/
+GNUNET_TEST_HOME = /tmp/gnunet-test-vpn/
[transport]
PLUGINS = tcp
Modified: gnunet/src/regex/test_regex_api_data.conf
===================================================================
--- gnunet/src/regex/test_regex_api_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/regex/test_regex_api_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-regex-api/
+GNUNET_TEST_HOME = /tmp/test-regex-api/
[fs]
AUTOSTART = NO
Modified: gnunet/src/set/test_set.conf
===================================================================
--- gnunet/src/set/test_set.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/set/test_set.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
# @INLINE@ test_set_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-set/
+GNUNET_TEST_HOME = /tmp/test-gnunet-set/
[set]
AUTOSTART = YES
Modified: gnunet/src/statistics/test_statistics_api_data.conf
===================================================================
--- gnunet/src/statistics/test_statistics_api_data.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/statistics/test_statistics_api_data.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-statistics/
+GNUNET_TEST_HOME = /tmp/test-gnunet-statistics/
[statistics]
PORT = 22353
@@ -7,7 +7,7 @@
[arm]
PORT = 22354
-DEFAULTSERVICES =
+DEFAULTSERVICES =
UNIXPATH = /tmp/test-statistics-service-arm.unix
[fs]
Modified: gnunet/src/testbed/test_testbed_api.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/testbed/test_testbed_api.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -47,10 +47,10 @@
PORT = 12368
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_api_barriers.conf.in
===================================================================
--- gnunet/src/testbed/test_testbed_api_barriers.conf.in 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_barriers.conf.in 2013-10-09
10:26:23 UTC (rev 30043)
@@ -53,7 +53,7 @@
PORT = 12368
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_api_statistics.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_statistics.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/testbed/test_testbed_api_statistics.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -57,10 +57,10 @@
PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_api_test_timeout.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_test_timeout.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_test_timeout.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -56,10 +56,10 @@
PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -56,10 +56,10 @@
PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -56,10 +56,10 @@
PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -49,10 +49,10 @@
PORT = 12368
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -56,10 +56,10 @@
PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -56,10 +56,10 @@
PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -56,10 +56,10 @@
PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -58,10 +58,10 @@
PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified:
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -56,10 +56,10 @@
PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified:
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -56,10 +56,10 @@
PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
[PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
[dns]
AUTOSTART = NO
Modified: gnunet/src/testbed/test_testbed_logger_api.conf
===================================================================
--- gnunet/src/testbed/test_testbed_logger_api.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/testbed/test_testbed_logger_api.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,3 +1,3 @@
[testbed-logger]
UNIXPATH=/tmp/testbed-logger.sock
-DIR=$SERVICEHOME/data
\ No newline at end of file
+DIR=$GNUNET_TEST_HOME/data
\ No newline at end of file
Modified: gnunet/src/testing/test_testing_defaults.conf
===================================================================
--- gnunet/src/testing/test_testing_defaults.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/testing/test_testing_defaults.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
+GNUNET_TEST_HOME = /tmp/test-gnunet-testing/
[resolver]
PORT = 2564
Modified: gnunet/src/testing/test_testing_sharedservices.conf
===================================================================
--- gnunet/src/testing/test_testing_sharedservices.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/testing/test_testing_sharedservices.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
+GNUNET_TEST_HOME = /tmp/test-gnunet-testing/
[testbed-logger]
PORT = 15000
Modified: gnunet/src/topology/test_gnunet_daemon_topology_data.conf
===================================================================
--- gnunet/src/topology/test_gnunet_daemon_topology_data.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/topology/test_gnunet_daemon_topology_data.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-gnunet-topology/
+GNUNET_TEST_HOME = /tmp/test-gnunet-topology/
[resolver]
PORT = 2664
Modified: gnunet/src/topology/topology.conf
===================================================================
--- gnunet/src/topology/topology.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/topology/topology.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -2,7 +2,5 @@
MINIMUM-FRIENDS = 0
FRIENDS-ONLY = NO
TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
+FRIENDS = $GNUNET_CONFIG_HOME/topology/friends.txt
BINARY = gnunet-daemon-topology
-
-
Modified: gnunet/src/transport/template_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer1.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/transport/template_cfg_peer1.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,10 +1,7 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[nat]
RETURN_LOCAL_ADDRESSES = YES
DISABLEV6 = NO
Modified: gnunet/src/transport/template_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer2.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/transport/template_cfg_peer2.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,10 +1,7 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[nat]
RETURN_LOCAL_ADDRESSES = YES
DISABLEV6 = NO
@@ -35,8 +32,7 @@
[peerinfo]
PORT = 12011
UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-TRUST = $SERVICEHOME/data/credit/
-USE_INCLUDED_HELLOS = NO
+USE_INCLUDED_HELLOS = NO
[transport]
#PREFIX = valgrind --leak-check=full
Modified: gnunet/src/transport/test_plugin_transport_data.conf
===================================================================
--- gnunet/src/transport/test_plugin_transport_data.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_plugin_transport_data.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-plugin-transport/
[transport-tcp]
PORT = 2400
Modified:
gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
[transport-bluetooth]
INTERFACE = hci0
Modified:
gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
[transport-bluetooth]
INTERFACE = hci1
Modified: gnunet/src/transport/test_quota_compliance_bluetooth_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_bluetooth_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_bluetooth_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
[transport-bluetooth]
INTERFACE = hci0
Modified: gnunet/src/transport/test_quota_compliance_bluetooth_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_bluetooth_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_bluetooth_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
[transport-bluetooth]
INTERFACE = hci1
Modified: gnunet/src/transport/test_quota_compliance_data.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_data.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_data.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-plugin-transport/
[transport-tcp]
PORT = 2368
Modified: gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1
[transport-http_client]
Modified: gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
[transport-http_server]
PORT = 3010
Modified: gnunet/src/transport/test_quota_compliance_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_http_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1
[transport-http_client]
Modified: gnunet/src/transport/test_quota_compliance_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_http_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
[transport-http_server]
PORT = 3010
Modified: gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
[transport-https_client]
Modified: gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
[transport-https_server]
PORT = 3001
Modified: gnunet/src/transport/test_quota_compliance_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_https_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
[transport-https_client]
Modified: gnunet/src/transport/test_quota_compliance_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_https_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
[transport-https_server]
PORT = 3001
Modified: gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/
[transport-tcp]
PORT = 4094
Modified: gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/quota-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p2/
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/
[transport-tcp]
PORT = 4094
Modified: gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_quota_compliance_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_udp_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_udp_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
[transport-udp]
PORT = 4368
Modified: gnunet/src/transport/test_quota_compliance_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_udp_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_udp_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
[transport-udp]
PORT = 3368
Modified: gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
[arm]
PORT = 4087
Modified: gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
[arm]
PORT = 3087
Modified: gnunet/src/transport/test_quota_compliance_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_unix_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
[transport-unix]
PORT = 12120
Modified: gnunet/src/transport/test_quota_compliance_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_unix_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
[transport-unix]
PORT = 12136
Modified: gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
[transport-wlan]
TESTMODE = 1
Modified: gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
[transport-wlan]
INTERFACE = mon1
Modified: gnunet/src/transport/test_quota_compliance_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_wlan_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
[transport-wlan]
TESTMODE = 1
Modified: gnunet/src/transport/test_quota_compliance_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_quota_compliance_wlan_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
[transport-wlan]
INTERFACE = mon1
Modified:
gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[arm]
PORT = 12000
Modified:
gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[arm]
PORT = 12010
Modified: gnunet/src/transport/test_transport_api_bluetooth_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bluetooth_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_bluetooth_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
[transport-bluetooth]
INTERFACE = hci0
Modified: gnunet/src/transport/test_transport_api_bluetooth_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bluetooth_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_bluetooth_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
[transport-bluetooth]
INTERFACE = hci1
Modified: gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_transport_api_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_http_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
[transport-http_client]
Modified: gnunet/src/transport/test_transport_api_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_http_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
[transport-http_server]
PORT = 12090
Modified: gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
[transport-http_client]
Modified: gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
[transport-http_client]
Modified: gnunet/src/transport/test_transport_api_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_https_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,11 +1,11 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
[transport-https_client]
PORT = 12100
-KEY_FILE = $SERVICEHOME/https_key_p1.key
-CERT_FILE = $SERVICEHOME/https_cert_p1.crt
+KEY_FILE = $GNUNET_TEST_HOME/https_key_p1.key
+CERT_FILE = $GNUNET_TEST_HOME/https_cert_p1.crt
[arm]
PORT = 12105
Modified: gnunet/src/transport/test_transport_api_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_https_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/
[transport-https_server]
EXTERNAL_HOSTNAME = localhost/test
@@ -11,8 +11,8 @@
# Does the external hostname use the same port?
USE_IPv6 = YES
#BINDTO = 127.0.0.1
-KEY_FILE = $SERVICEHOME/https_key_p2.key
-CERT_FILE = $SERVICEHOME/https_cert_p2.crt
+KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key
+CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
[arm]
PORT = 12115
Modified: gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 0
Modified: gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified:
gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified:
gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified:
gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified:
gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_transport_api_multi_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_multi_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-multi-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p1/
[transport-tcp]
PORT = 12140
Modified: gnunet/src/transport/test_transport_api_multi_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_multi_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-multi-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p2/
[nat]
ALLOW_NAT = NO
Modified:
gnunet/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
[transport-bluetooth]
INTERFACE = hci0
Modified:
gnunet/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
[transport-bluetooth]
INTERFACE = hci1
Modified: gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
[transport-http_client]
Modified: gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
[transport-http_server]
PORT = 12090
Modified: gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
[transport-https_client]
Modified: gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,11 +1,11 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/
[transport-https_server]
PORT = 12310
-KEY_FILE = $SERVICEHOME/https_key_p2.key
-CERT_FILE = $SERVICEHOME/https_cert_p2.crt
+KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key
+CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
[arm]
PORT = 12315
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
[nat]
BEHIND_NAT = YES
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
[nat]
DISABLEV6 = YES
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
[transport-wlan]
TESTMODE = 1
Modified: gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
[transport-wlan]
INTERFACE = mon1
Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-nat-p1/
[nat]
BEHIND_NAT = YES
Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-nat-p2/
[nat]
DISABLEV6 = YES
Modified: gnunet/src/transport/test_transport_api_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_tcp_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_tcp_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
[nat]
Modified: gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
[nat]
Modified: gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
[transport-https_client]
Modified: gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,11 +1,11 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/
[transport-https_server]
PORT = 12110
-KEY_FILE = $SERVICEHOME/https_key_p2.key
-CERT_FILE = $SERVICEHOME/https_cert_p2.crt
+KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key
+CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
[arm]
PORT = 12115
Modified: gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[nat]
ALLOW_NAT = NO
Modified: gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
[transport-udp]
PORT = 12040
Modified: gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
[transport-udp]
PORT = 12050
Modified: gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
[arm]
PORT = 12125
Modified: gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
[arm]
PORT = 12135
Modified: gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-nat-p1/
[nat]
BEHIND_NAT = YES
Modified: gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-nat-p2/
[nat]
ALLOW_NAT = YES
Modified: gnunet/src/transport/test_transport_api_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_udp_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
[transport-udp]
PORT = 0
Modified: gnunet/src/transport/test_transport_api_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_udp_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
[transport-udp]
PORT = 12050
Modified: gnunet/src/transport/test_transport_api_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unix_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_unix_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
[arm]
PORT = 12125
Modified: gnunet/src/transport/test_transport_api_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unix_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_unix_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
[arm]
PORT = 12135
Modified:
gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
[transport-bluetooth]
INTERFACE = hci0
Modified:
gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
[transport-bluetooth]
INTERFACE = hci1
Modified:
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
===================================================================
---
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
[transport-udp]
PORT = 12040
Modified:
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
===================================================================
---
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
[transport-udp]
PORT = 12050
Modified: gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
[transport-udp]
PORT = 12040
Modified: gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
[transport-udp]
PORT = 12050
Modified: gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
[arm]
PORT = 12125
Modified: gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
[arm]
PORT = 12135
Modified: gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
[transport-wlan]
TESTMODE = 1
Modified: gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
[transport-wlan]
INTERFACE = mon1
Modified: gnunet/src/transport/test_transport_api_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_wlan_peer1.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_wlan_peer1.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
[transport-wlan]
INTERFACE = mon0
Modified: gnunet/src/transport/test_transport_api_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_wlan_peer2.conf 2013-10-09
10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_api_wlan_peer2.conf 2013-10-09
10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
[transport-wlan]
INTERFACE = mon1
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
===================================================================
---
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
===================================================================
---
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf
2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf
2013-10-09 10:26:23 UTC (rev 30043)
@@ -1,6 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_transport_defaults.conf
===================================================================
--- gnunet/src/transport/test_transport_defaults.conf 2013-10-09 10:20:03 UTC
(rev 30042)
+++ gnunet/src/transport/test_transport_defaults.conf 2013-10-09 10:26:23 UTC
(rev 30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-transport-api/
+GNUNET_TEST_HOME = /tmp/test-transport-api/
[transport-tcp]
TIMEOUT = 300 s
Modified: gnunet/src/util/program.c
===================================================================
--- gnunet/src/util/program.c 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/util/program.c 2013-10-09 10:26:23 UTC (rev 30043)
@@ -145,6 +145,8 @@
#endif
char *loglev;
char *logfile;
+ char *cfg_fn;
+ const char *xdg;
int ret;
unsigned int cnt;
unsigned long long skew_offset;
@@ -195,7 +197,6 @@
cc.task = task;
cc.task_cls = task_cls;
cc.cfg = cfg = GNUNET_CONFIGURATION_create ();
-
/* prepare */
#if ENABLE_NLS
setlocale (LC_ALL, "");
@@ -223,7 +224,15 @@
qsort (allopts, cnt, sizeof (struct GNUNET_GETOPT_CommandLineOption),
&cmd_sorter);
loglev = NULL;
- cc.cfgfile = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
+ xdg = getenv ("XDG_CONFIG_HOME");
+ if (NULL != xdg)
+ GNUNET_asprintf (&cfg_fn,
+ "%s%s%s",
+ xdg,
+ DIR_SEPARATOR_STR,
+ "gnunet.config");
+ else
+ cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
lpfx = GNUNET_strdup (binaryName);
if (NULL != (spc = strstr (lpfx, " ")))
*spc = '\0';
@@ -239,13 +248,15 @@
GNUNET_free (lpfx);
return (ret == GNUNET_SYSERR) ? GNUNET_SYSERR : GNUNET_OK;
}
+ if (NULL == cc.cfgfile)
+ cc.cfgfile = GNUNET_strdup (cfg_fn);
if (GNUNET_YES ==
GNUNET_DISK_file_test (cc.cfgfile))
(void) GNUNET_CONFIGURATION_load (cfg, cc.cfgfile);
else
{
(void) GNUNET_CONFIGURATION_load (cfg, NULL);
- if (0 != strcmp (cc.cfgfile, GNUNET_DEFAULT_USER_CONFIG_FILE))
+ if (0 != strcmp (cc.cfgfile, cfg_fn))
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not access configuration file `%s'\n"),
cc.cfgfile);
@@ -276,7 +287,8 @@
/* clean up */
GNUNET_SPEEDUP_stop_ ();
GNUNET_CONFIGURATION_destroy (cfg);
- GNUNET_free_non_null (cc.cfgfile);
+ GNUNET_free (cc.cfgfile);
+ GNUNET_free (cfg_fn);
GNUNET_free_non_null (loglev);
GNUNET_free_non_null (logfile);
return GNUNET_OK;
@@ -292,8 +304,8 @@
* @param binaryHelp help text for the program
* @param options command line options
* @param task main function to run
- * @param task_cls closure for task
- * @return GNUNET_SYSERR on error, GNUNET_OK on success
+ * @param task_cls closure for @a task
+ * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
*/
int
GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName,
Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/util/service.c 2013-10-09 10:26:23 UTC (rev 30043)
@@ -1716,8 +1716,8 @@
* @param service_name our service name
* @param options service options
* @param task main task of the service
- * @param task_cls closure for task
- * @return GNUNET_SYSERR on error, GNUNET_OK
+ * @param task_cls closure for @a task
+ * @return #GNUNET_SYSERR on error, #GNUNET_OK
* if we shutdown nicely
*/
int
@@ -1730,6 +1730,7 @@
int err;
int ret;
char *cfg_fn;
+ char *opt_cfg_fn;
char *loglev;
char *logfile;
int do_daemonize;
@@ -1739,9 +1740,10 @@
long long clock_offset;
struct GNUNET_SERVICE_Context sctx;
struct GNUNET_CONFIGURATION_Handle *cfg;
+ const char *xdg;
struct GNUNET_GETOPT_CommandLineOption service_options[] = {
- GNUNET_GETOPT_OPTION_CFG_FILE (&cfg_fn),
+ GNUNET_GETOPT_OPTION_CFG_FILE (&opt_cfg_fn),
{'d', "daemonize", NULL,
gettext_noop ("do daemonize (detach from terminal)"), 0,
GNUNET_GETOPT_set_one, &do_daemonize},
@@ -1755,7 +1757,16 @@
do_daemonize = 0;
logfile = NULL;
loglev = NULL;
- cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
+ opt_cfg_fn = NULL;
+ xdg = getenv ("XDG_CONFIG_HOME");
+ if (NULL != xdg)
+ GNUNET_asprintf (&cfg_fn,
+ "%s%s%s",
+ xdg,
+ DIR_SEPARATOR_STR,
+ "gnunet.config");
+ else
+ cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
memset (&sctx, 0, sizeof (sctx));
sctx.options = options;
sctx.ready_confirm_fd = -1;
@@ -1777,16 +1788,18 @@
}
if (GNUNET_OK != GNUNET_log_setup (service_name, loglev, logfile))
HANDLE_ERROR;
+ if (NULL == opt_cfg_fn)
+ opt_cfg_fn = GNUNET_strdup (cfg_fn);
if (GNUNET_YES ==
- GNUNET_DISK_file_test (cfg_fn))
- (void) GNUNET_CONFIGURATION_load (cfg, cfg_fn);
+ GNUNET_DISK_file_test (opt_cfg_fn))
+ (void) GNUNET_CONFIGURATION_load (cfg, opt_cfg_fn);
else
{
(void) GNUNET_CONFIGURATION_load (cfg, NULL);
- if (0 != strcmp (cfg_fn, GNUNET_DEFAULT_USER_CONFIG_FILE))
+ if (0 != strcmp (opt_cfg_fn, cfg_fn))
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not access configuration file `%s'\n"),
- cfg_fn);
+ opt_cfg_fn);
}
if (GNUNET_OK != setup_service (&sctx))
goto shutdown;
@@ -1795,7 +1808,9 @@
if (GNUNET_OK != set_user_id (&sctx))
goto shutdown;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Service `%s' runs with configuration from `%s'\n", service_name,
cfg_fn);
+ "Service `%s' runs with configuration from `%s'\n",
+ service_name,
+ opt_cfg_fn);
if ((GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_number (sctx.cfg, "TESTING",
"SKEW_OFFSET", &skew_offset)) &&
@@ -1853,6 +1868,7 @@
GNUNET_free_non_null (logfile);
GNUNET_free_non_null (loglev);
GNUNET_free (cfg_fn);
+ GNUNET_free (opt_cfg_fn);
GNUNET_free_non_null (sctx.v4_denied);
GNUNET_free_non_null (sctx.v6_denied);
GNUNET_free_non_null (sctx.v4_allowed);
Modified: gnunet/src/util/test_resolver_api_data.conf
===================================================================
--- gnunet/src/util/test_resolver_api_data.conf 2013-10-09 10:20:03 UTC (rev
30042)
+++ gnunet/src/util/test_resolver_api_data.conf 2013-10-09 10:26:23 UTC (rev
30043)
@@ -1,5 +1,5 @@
[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-statistics/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-statistics/
[resolver]
PORT = 22354
Modified: gnunet/src/util/util.conf
===================================================================
--- gnunet/src/util/util.conf 2013-10-09 10:20:03 UTC (rev 30042)
+++ gnunet/src/util/util.conf 2013-10-09 10:26:23 UTC (rev 30043)
@@ -5,7 +5,10 @@
# defaults with the syntax "${VAR:-default}". Here, "default" can again
# be a $-expression.
#
-GNUNET_HOME = $HOME
+# We usually want $HOME for $GNUNET_HOME, but we allow testcases to
+# easily override this by setting $GNUNET_TEST_HOME.
+#
+GNUNET_HOME = ${GNUNET_TEST_HOME:-$HOME}
# see XDG Base Directory Specification at
# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
@@ -24,8 +27,8 @@
GNUNET_RUNTIME_DIR = ${XDG_RUNTIME_DIR:-${TMPDIR:-${TMP:-/tmp}}}gnunet/
# Legacy option...
-SERVICEHOME = ~/.gnunet/
-# SERVICEHOME = /var/lib/gnunet/
+GNUNET_TEST_HOME = ~/.gnunet/
+# GNUNET_TEST_HOME = /var/lib/gnunet/
# DEFAULTCONFIG = /etc/gnunet.conf
# If 'DEFAULTCONFIG' is not defined, the current
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30043 - in gnunet: . src/arm src/ats src/core src/datastore src/dht src/dv src/experimentation src/fs src/gns src/hostlist src/integration-tests/confs src/mesh src/namestore src/nat src/nse src/peerinfo src/peerinfo-tool src/psycstore src/pt src/regex src/set src/statistics src/testbed src/testing src/topology src/transport src/util,
gnunet <=