diff options
author | Christian Fuchs <christian.fuchs@cfuchs.net> | 2013-10-15 12:28:41 +0000 |
---|---|---|
committer | Christian Fuchs <christian.fuchs@cfuchs.net> | 2013-10-15 12:28:41 +0000 |
commit | d08487cfb5cd5854cd44c6d79dcfbb312fb83504 (patch) | |
tree | e805b2b25aafb4acf9da61fdf3dfc70cb0c88973 /src/scalarproduct | |
parent | 93cbf8f393a339e0d339089ebbd74423838a6a8f (diff) | |
download | gnunet-d08487cfb5cd5854cd44c6d79dcfbb312fb83504.tar.gz gnunet-d08487cfb5cd5854cd44c6d79dcfbb312fb83504.zip |
updated test-config template for scalarproduct
added declaration of GNUNET_TESTING_PREFIX to the test script
Diffstat (limited to 'src/scalarproduct')
-rw-r--r-- | src/scalarproduct/gnunet-service-scalarproduct.c | 2 | ||||
-rw-r--r-- | src/scalarproduct/scalarproduct_api.c | 2 | ||||
-rw-r--r-- | src/scalarproduct/test_scalarproduct.conf | 94 | ||||
-rwxr-xr-x | src/scalarproduct/test_scalarproduct.sh | 2 |
4 files changed, 98 insertions, 2 deletions
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) | |||
2485 | &run, NULL)) ? 0 : 1; | 2485 | &run, NULL)) ? 0 : 1; |
2486 | } | 2486 | } |
2487 | 2487 | ||
2488 | /* end of gnunet-service-ext.c */ | 2488 | /* 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 () | |||
542 | } | 542 | } |
543 | } | 543 | } |
544 | 544 | ||
545 | /* end of ext_api.c */ | 545 | /* 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 @@ | |||
1 | [arm] | ||
2 | DEFAULTSERVICES = core mesh statistics scalarproduct | ||
3 | PORT = 12366 | ||
4 | |||
5 | [ats] | ||
6 | WAN_QUOTA_OUT = 3932160 | ||
7 | WAN_QUOTA_IN = 3932160 | ||
8 | |||
9 | [block] | ||
10 | plugins = dht test | ||
11 | |||
12 | [consensus] | ||
13 | AUTOSTART = NO | ||
14 | |||
15 | [core] | ||
16 | PORT = 12092 | ||
17 | AUTOSTART = YES | ||
18 | |||
19 | [dht] | ||
20 | AUTOSTART = YES | ||
21 | DISABLE_TRY_CONNECT = NO | ||
22 | |||
23 | [dhtcache] | ||
24 | QUOTA = 1 MB | ||
25 | DATABASE = heap | ||
26 | |||
27 | [dns] | ||
28 | AUTOSTART = NO | ||
29 | |||
30 | [fs] | ||
31 | AUTOSTART = NO | ||
32 | |||
33 | [gnunetd] | ||
34 | HOSTKEY = $SERVICEHOME/.hostkey | ||
35 | |||
36 | [mesh] | ||
37 | #AUTOSTART = YES | ||
38 | ACCEPT_FROM = 127.0.0.1; | ||
39 | PORT = 10700 | ||
40 | |||
41 | [nat] | ||
42 | RETURN_LOCAL_ADDRESSES = YES | ||
43 | |||
44 | [namestore] | ||
45 | AUTOSTART = NO | ||
46 | |||
47 | [nse] | ||
48 | AUTOSTART = NO | ||
49 | |||
50 | [PATHS] | ||
51 | GNUNET_TEST_HOME = /tmp/test-scalarproduct/ | ||
52 | |||
53 | [psycstore] | ||
54 | AUTOSTART = NO | ||
55 | |||
56 | [regex] | ||
57 | AUTOSTART = NO | ||
58 | |||
59 | [resolver] | ||
60 | AUTOSTART = NO | ||
61 | HOSTNAME = localhost | ||
62 | |||
63 | [statistics] | ||
64 | AUTOSTART = NO | ||
65 | |||
66 | [scalarproduct] | ||
67 | AUTOSTART = YES | ||
68 | BINARY = gnunet-service-scalarproduct | ||
69 | UNIXPATH = $SERVICEHOME/scalarproduct.sock | ||
70 | #HOME = $SERVICEHOME | ||
71 | HOSTNAME = localhost | ||
72 | PORT = 13087 | ||
73 | |||
74 | [transport] | ||
75 | PLUGINS = tcp | ||
76 | ACCEPT_FROM6 = ::1; | ||
77 | ACCEPT_FROM = 127.0.0.1; | ||
78 | NEIGHBOUR_LIMIT = 50 | ||
79 | PORT = 12365 | ||
80 | |||
81 | [transport-tcp] | ||
82 | TIMEOUT = 300 s | ||
83 | PORT = 12368 | ||
84 | |||
85 | [testbed] | ||
86 | OVERLAY_TOPOLOGY = LINE | ||
87 | |||
88 | [TESTING] | ||
89 | WEAKRANDOM = YES | ||
90 | |||
91 | [vpn] | ||
92 | AUTOSTART = NO | ||
93 | |||
94 | |||
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 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | 2 | ||
3 | #necessary to make the testing prefix deterministic, so we can access the config files | ||
4 | GNUNET_TESTING_PREFIX=/tmp/test-scalarproduct1337 | ||
3 | CFGA="-c ./test_scalarproduct_alice.conf" | 5 | CFGA="-c ./test_scalarproduct_alice.conf" |
4 | CFGB="-c ./test_scalarproduct_bob.conf" | 6 | CFGB="-c ./test_scalarproduct_bob.conf" |
5 | #can't use ` directly | 7 | #can't use ` directly |