From d08487cfb5cd5854cd44c6d79dcfbb312fb83504 Mon Sep 17 00:00:00 2001
From: Christian Fuchs <christian.fuchs@cfuchs.net>
Date: Tue, 15 Oct 2013 12:28:41 +0000
Subject: updated test-config template for scalarproduct added declaration of
 GNUNET_TESTING_PREFIX to the test script

---
 src/scalarproduct/gnunet-service-scalarproduct.c |  2 +-
 src/scalarproduct/scalarproduct_api.c            |  2 +-
 src/scalarproduct/test_scalarproduct.conf        | 94 ++++++++++++++++++++++++
 src/scalarproduct/test_scalarproduct.sh          |  2 +
 4 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 src/scalarproduct/test_scalarproduct.conf

(limited to 'src/scalarproduct')

diff --git a/src/scalarproduct/gnunet-service-scalarproduct.c b/src/scalarproduct/gnunet-service-scalarproduct.c
index 15692de4a..e10e16968 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct.c
@@ -2485,4 +2485,4 @@ main (int argc, char *const *argv)
                               &run, NULL)) ? 0 : 1;
 }
 
-/* end of gnunet-service-ext.c */
+/* end of gnunet-service-scalarproduct.c */
diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c
index ad5fc1a54..dcacd85c9 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
@@ -542,4 +542,4 @@ GNUNET_SCALARPRODUCT_disconnect ()
     }
 }
 
-/* end of ext_api.c */
+/* end of scalarproduct_api.c */
diff --git a/src/scalarproduct/test_scalarproduct.conf b/src/scalarproduct/test_scalarproduct.conf
new file mode 100644
index 000000000..1d28982c8
--- /dev/null
+++ b/src/scalarproduct/test_scalarproduct.conf
@@ -0,0 +1,94 @@
+[arm]
+DEFAULTSERVICES = core mesh statistics scalarproduct
+PORT = 12366
+
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
+[block]
+plugins = dht test
+
+[consensus]
+AUTOSTART = NO
+
+[core]
+PORT = 12092
+AUTOSTART = YES
+
+[dht]
+AUTOSTART = YES
+DISABLE_TRY_CONNECT = NO
+
+[dhtcache]
+QUOTA = 1 MB
+DATABASE = heap
+
+[dns]
+AUTOSTART = NO
+
+[fs]
+AUTOSTART = NO
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[mesh]
+#AUTOSTART = YES
+ACCEPT_FROM = 127.0.0.1;
+PORT = 10700
+
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
+
+[namestore]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-scalarproduct/
+
+[psycstore]
+AUTOSTART = NO
+
+[regex]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = NO
+HOSTNAME = localhost
+
+[statistics]
+AUTOSTART = NO
+
+[scalarproduct]
+AUTOSTART = YES
+BINARY = gnunet-service-scalarproduct
+UNIXPATH = $SERVICEHOME/scalarproduct.sock
+#HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 13087
+
+[transport]
+PLUGINS = tcp
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+PORT = 12365
+
+[transport-tcp]
+TIMEOUT = 300 s
+PORT = 12368
+
+[testbed]
+OVERLAY_TOPOLOGY = LINE
+
+[TESTING]
+WEAKRANDOM = YES
+
+[vpn]
+AUTOSTART = NO
+
+
diff --git a/src/scalarproduct/test_scalarproduct.sh b/src/scalarproduct/test_scalarproduct.sh
index 81bd9c2ec..ee828e4aa 100755
--- a/src/scalarproduct/test_scalarproduct.sh
+++ b/src/scalarproduct/test_scalarproduct.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#necessary to make the testing prefix deterministic, so we can access the config files
+GNUNET_TESTING_PREFIX=/tmp/test-scalarproduct1337
 CFGA="-c ./test_scalarproduct_alice.conf"
 CFGB="-c ./test_scalarproduct_bob.conf"
 					#can't use ` directly
-- 
cgit v1.2.3