all tests use generated configs and pass on my system

diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 4933525129e8e8e68eeeeccd702d52714e1edf8e..a8a780ff6b73b0153fd7c3fcbe8b7d911a98c667 100644 (file)
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -269,7 +269,8 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
     if (die_task != GNUNET_SCHEDULER_NO_TASK)
       GNUNET_SCHEDULER_cancel (die_task);
     test_failed = GNUNET_YES;
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    die_task = GNUNET_SCHEDULER_add_now (&end_badly,
+        NULL);
     return;
   }
 #if VERBOSE
@@ -498,13 +499,13 @@ run_measurement (unsigned long long p1_quota_in, unsigned long long p1_quota_out
       "Generated config file `%s'\n",
       gen_cfg_p2);
 
-  p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
+  p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p1, 1,
                                             &notify_receive,
                                             &notify_connect, &notify_disconnect,
                                             &start_cb,
                                             NULL);
 
-  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
+  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p2, 2,
                                             &notify_receive,
                                             &notify_connect, &notify_disconnect,
                                             &start_cb,

diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 06d0e275db9f89e4d9f53db1424d7c35edc5b9fe..872a7536517a23837c0537f797a97687a71af94a 100644 (file)
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer1
 DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-http]
 PORT = 4010
 DEBUG = NO

diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index d3a039cfa0f692179ae87f08ac69673f6ebbac1d..256dc61eb5ba4c9b681e8bc9f3586983ccbfb045 100644 (file)
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-http]
 PORT = 3010
 DEBUG = NO

diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index 8859304bba35ecb6a2c843266ec543c015505f34..47f93096c7045b582659d15f2530ba136316bb02 100644 (file)
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer1/
 DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-https]
 PORT = 4001
 CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL

diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index afe4824bdb0ac7115c879e7ed8965658a0aaaea9..79bf0331ff331aff59301d03f56484b848d6a43b 100644 (file)
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-https]
 PORT = 3001
 CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL

diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
index 47f6a639cc9cb504eeaa1747a8a8c9dbc05bd50c..a7bac62ca38defb9cbf9dae6ddcab0d84504688d 100644 (file)
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
 DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer1.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-tcp]
 PORT = 4094
 

diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
index d9c182be52a5cb3cad6f058cec1c8387351afaf4..18295ac60088ff4504e7e3e8c480d46e54cd739c 100644 (file)
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test-transport/quota-tcp-p2/
 DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-tcp]
 PORT = 12015
 TIMEOUT = 5000

diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index f92d9cd98f00d04ec4db42021fcab597db9bde0c..ff63514b10a628549919084d00754da902efb40a 100644 (file)
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
 DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-tcp]
 PORT = 4094
 

diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 5fe5d070e8ad18d7f18e1fc7a4ab005ccc63aea5..4765075882ee1f16fbc072c6b1ce21d58bd39f24 100644 (file)
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test-transport/api-tcp-p2/
 DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-tcp]
 PORT = 12015
 TIMEOUT = 5000

diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index 3e52c21670fb90f7a6c474f91f4c4b2e6027ad07..fceee7bcd0af07d5b73ce767ef33f2ce74e390c5 100644 (file)
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer1/
 DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-udp]
 PORT = 4368
 MAX_BPS = 50000000

diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index d6d928f7ca56b617267a7fb8a3e5317dee401f66..4b58c934f2945edfb1c72a08f6223240a353f58e 100644 (file)
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -1,14 +1,8 @@
 @INLINE@ template_cfg_peer2.conf
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
 [PATHS]
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-udp]
 PORT = 3368
 MAX_BPS = 50000000

diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index 20844227aa6a71930bc3bf1f07e2b5ee68c9a284..60e656bad43474dc294f745eec987ae258fce853 100644 (file)
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer1/
 DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-unix]
 PORT = 12120
 

diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index 332226a84c25b518e04437ae8d90923477aad080..b4f0b648abacfeccda3d7bb542d89dd2f993a5b4 100644 (file)
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -3,10 +3,6 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf
 
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
 [transport-unix]
 PORT = 12136