From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 15 Dec 2014 18:41:03 +0000 (+0000)
Subject: -simplify configs, do use defaults where they work / are identical
X-Git-Tag: initial-import-from-subversion-38251~2875
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=51b6ce1210b50a02ce2466d4c54f69ee273fb55e;p=oweals%2Fgnunet.git

-simplify configs, do use defaults where they work / are identical
---

diff --git a/src/ats/perf_ats_simplistic_bandwidth.conf b/src/ats/perf_ats_simplistic_bandwidth.conf
index 95a0b5894..cec5b36f5 100644
--- a/src/ats/perf_ats_simplistic_bandwidth.conf
+++ b/src/ats/perf_ats_simplistic_bandwidth.conf
@@ -24,4 +24,4 @@ WLAN_QUOTA_IN = 128 KiB
 WLAN_QUOTA_OUT = 128 KiB
 # BLUETOOTH
 BLUETOOTH_QUOTA_IN = 128 KiB
-BLUETOOTH_QUOTA_OUT = 128 KiB
\ No newline at end of file
+BLUETOOTH_QUOTA_OUT = 128 KiB
diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf
index ded22b7a2..83e48bc0a 100644
--- a/src/ats/test_ats_api.conf
+++ b/src/ats/test_ats_api.conf
@@ -3,22 +3,7 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
 
-[arm]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock
-
 [ats]
-#PREFIX = valgrind --leak-check=full --track-origins=yes --num-callers=25
-AUTOSTART = YES
-PORT = 12002
-HOSTNAME = localhost
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-ats.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
 # Enable MLP mode (default: NO)
 #MODE = RIL
 MODE = MLP
diff --git a/src/ats/test_ats_mlp.conf b/src/ats/test_ats_mlp.conf
index e8862d95d..6a3626850 100644
--- a/src/ats/test_ats_mlp.conf
+++ b/src/ats/test_ats_mlp.conf
@@ -1,22 +1,7 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
 
-[arm]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock
-
 [ats]
-#PREFIX = valgrind --leak-check=full --track-origins=yes --num-callers=25
-AUTOSTART = YES
-PORT = 12002
-HOSTNAME = localhost
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-ats.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
 # Enable MLP mode (default: NO)
 MODE = MLP
 # Network specific inbound/outbound quotas
diff --git a/src/ats/test_ats_solver_default.conf b/src/ats/test_ats_solver_default.conf
index 6b73d048e..e419c8f35 100644
--- a/src/ats/test_ats_solver_default.conf
+++ b/src/ats/test_ats_solver_default.conf
@@ -1,6 +1,2 @@
-[arm]
-PORT = 12001
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock
+@INLINE@ ../../contrib/no_forcestart.conf
 
-[transport]
-AUTOSTART = NO
diff --git a/src/ats/test_ats_solver_mlp.conf b/src/ats/test_ats_solver_mlp.conf
index 64dadefbf..407b616f8 100644
--- a/src/ats/test_ats_solver_mlp.conf
+++ b/src/ats/test_ats_solver_mlp.conf
@@ -1,7 +1,6 @@
 @INLINE@ test_ats_solver_default.conf
 
 [ats]
-#PREFIX = valgrind --leak-check=yes
 MODE = MLP
 # UNSPECIFIED
 UNSPECIFIED_QUOTA_IN = 64 KiB
@@ -17,4 +16,4 @@ WAN_QUOTA_IN = 64 KiB
 WAN_QUOTA_OUT = 64 KiB
 # WLAN
 WLAN_QUOTA_IN = 512
-WLAN_QUOTA_OUT = 512
\ No newline at end of file
+WLAN_QUOTA_OUT = 512
diff --git a/src/ats/test_ats_solver_proportional.conf b/src/ats/test_ats_solver_proportional.conf
index 407dbcb1c..912a419a0 100644
--- a/src/ats/test_ats_solver_proportional.conf
+++ b/src/ats/test_ats_solver_proportional.conf
@@ -1,7 +1,6 @@
 @INLINE@ test_ats_solver_default.conf
 
 [ats]
-#PREFIX = valgrind --leak-check=yes
 MODE = PROPORTIONAL
 # UNSPECIFIED
 UNSPECIFIED_QUOTA_IN = 64 KiB
@@ -17,4 +16,4 @@ WAN_QUOTA_IN = 64 KiB
 WAN_QUOTA_OUT = 64 KiB
 # WLAN
 WLAN_QUOTA_IN = 512
-WLAN_QUOTA_OUT = 512
\ No newline at end of file
+WLAN_QUOTA_OUT = 512
diff --git a/src/ats/test_ats_solver_ril.conf b/src/ats/test_ats_solver_ril.conf
index f7b4503a9..fac1a2a30 100644
--- a/src/ats/test_ats_solver_ril.conf
+++ b/src/ats/test_ats_solver_ril.conf
@@ -1,7 +1,6 @@
 @INLINE@ test_ats_solver_default.conf
 
 [ats]
-#PREFIX = valgrind --leak-check=yes
 MODE = RIL
 # UNSPECIFIED
 UNSPECIFIED_QUOTA_IN = 64 KiB
@@ -28,4 +27,4 @@ RIL_DISCOUNT_BETA = 0.7
 RIL_GRADIENT_STEP_SIZE = 0.3
 RIL_TRACE_DECAY = 0.2
 RIL_EXPLORE_RATIO = 0.1
-RIL_GLOBAL_REWARD_SHARE = 1
\ No newline at end of file
+RIL_GLOBAL_REWARD_SHARE = 1