diff options
| author | xrs <xrs@mail36.net> | 2018-06-23 16:58:42 +0200 |
|---|---|---|
| committer | xrs <xrs@mail36.net> | 2018-06-23 16:58:42 +0200 |
| commit | 99c6e18e63181d8759ecbb398d58019a55d3ce6f (patch) | |
| tree | cf925bf99a6fbe60dbec8ead7248bc59a0c8cce6 /src/integration-tests | |
| parent | b993ca621717d0a9958b4138a32fb1e3cef7f54c (diff) | |
| parent | c293f84ea192f361baf720a3979589c0e0881abc (diff) | |
| download | gnunet-99c6e18e63181d8759ecbb398d58019a55d3ce6f.tar.gz gnunet-99c6e18e63181d8759ecbb398d58019a55d3ce6f.zip | |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/integration-tests')
| -rw-r--r-- | src/integration-tests/confs/c_no_nat_client.conf | 4 | ||||
| -rw-r--r-- | src/integration-tests/confs/c_no_nat_client_2.conf | 6 | ||||
| -rw-r--r-- | src/integration-tests/confs/test_defaults.conf | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index 26e816267..38a7d7fbc 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf | |||
| @@ -32,13 +32,13 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18 | |||
| 32 | PORT = 20022 | 32 | PORT = 20022 |
| 33 | 33 | ||
| 34 | [namestore] | 34 | [namestore] |
| 35 | AUTOSTART = YES | 35 | START_ON_DEMAND = YES |
| 36 | 36 | ||
| 37 | [dns] | 37 | [dns] |
| 38 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 | 38 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 |
| 39 | 39 | ||
| 40 | [consensus] | 40 | [consensus] |
| 41 | AUTOSTART = YES | 41 | START_ON_DEMAND = YES |
| 42 | 42 | ||
| 43 | [core] | 43 | [core] |
| 44 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 | 44 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 |
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf index 0cd6fc4f9..6c8f07632 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf | |||
| @@ -33,16 +33,16 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18 | |||
| 33 | PORT = 20022 | 33 | PORT = 20022 |
| 34 | 34 | ||
| 35 | [namestore] | 35 | [namestore] |
| 36 | AUTOSTART = YES | 36 | START_ON_DEMAND = YES |
| 37 | 37 | ||
| 38 | [dns] | 38 | [dns] |
| 39 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 | 39 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 |
| 40 | 40 | ||
| 41 | [consensus] | 41 | [consensus] |
| 42 | AUTOSTART = YES | 42 | START_ON_DEMAND = YES |
| 43 | 43 | ||
| 44 | [lockmanager] | 44 | [lockmanager] |
| 45 | AUTOSTART = YES | 45 | START_ON_DEMAND = YES |
| 46 | 46 | ||
| 47 | [core] | 47 | [core] |
| 48 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 | 48 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 |
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf index 39020515f..8114aeabd 100644 --- a/src/integration-tests/confs/test_defaults.conf +++ b/src/integration-tests/confs/test_defaults.conf | |||
| @@ -5,16 +5,16 @@ | |||
| 5 | FORCESTART = YES | 5 | FORCESTART = YES |
| 6 | 6 | ||
| 7 | [datastore] | 7 | [datastore] |
| 8 | AUTOSTART = YES | 8 | START_ON_DEMAND = YES |
| 9 | 9 | ||
| 10 | [dht] | 10 | [dht] |
| 11 | AUTOSTART = YES | 11 | START_ON_DEMAND = YES |
| 12 | 12 | ||
| 13 | [nse] | 13 | [nse] |
| 14 | AUTOSTART = YES | 14 | START_ON_DEMAND = YES |
| 15 | 15 | ||
| 16 | [cadet] | 16 | [cadet] |
| 17 | AUTOSTART = YES | 17 | START_ON_DEMAND = YES |
| 18 | 18 | ||
| 19 | [hostlist] | 19 | [hostlist] |
| 20 | FORCESTART = YES | 20 | FORCESTART = YES |