[GNUnet-SVN] r30190 - gnunet/src/scalarproduct

[gnunet]

Author: cfuchs
Date: 2013-10-15 14:28:41 +0200 (Tue, 15 Oct 2013)
New Revision: 30190

Added:
   gnunet/src/scalarproduct/test_scalarproduct.conf
Modified:
   gnunet/src/scalarproduct/gnunet-service-scalarproduct.c
   gnunet/src/scalarproduct/scalarproduct_api.c
   gnunet/src/scalarproduct/test_scalarproduct.sh
Log:
updated test-config template for scalarproduct
added declaration of GNUNET_TESTING_PREFIX to the test script


Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct.c
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct.c     2013-10-15 
10:49:30 UTC (rev 30189)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct.c     2013-10-15 
12:28:41 UTC (rev 30190)
@@ -2485,4 +2485,4 @@
                               &run, NULL)) ? 0 : 1;
 }
 
-/* end of gnunet-service-ext.c */
+/* end of gnunet-service-scalarproduct.c */

Modified: gnunet/src/scalarproduct/scalarproduct_api.c
===================================================================
--- gnunet/src/scalarproduct/scalarproduct_api.c        2013-10-15 10:49:30 UTC 
(rev 30189)
+++ gnunet/src/scalarproduct/scalarproduct_api.c        2013-10-15 12:28:41 UTC 
(rev 30190)
@@ -542,4 +542,4 @@
     }
 }
 
-/* end of ext_api.c */
+/* end of scalarproduct_api.c */

Added: gnunet/src/scalarproduct/test_scalarproduct.conf
===================================================================
--- gnunet/src/scalarproduct/test_scalarproduct.conf                            
(rev 0)
+++ gnunet/src/scalarproduct/test_scalarproduct.conf    2013-10-15 12:28:41 UTC 
(rev 30190)
@@ -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
+
+

Modified: gnunet/src/scalarproduct/test_scalarproduct.sh
===================================================================
--- gnunet/src/scalarproduct/test_scalarproduct.sh      2013-10-15 10:49:30 UTC 
(rev 30189)
+++ gnunet/src/scalarproduct/test_scalarproduct.sh      2013-10-15 12:28:41 UTC 
(rev 30190)
@@ -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