[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34529 - in gnunet: contrib src/arm src/core src/datastore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r34529 - in gnunet: contrib src/arm src/core src/datastore src/fs src/statistics src/transport |
|
Date: |
Thu, 11 Dec 2014 15:03:52 +0100 |
Author: grothoff
Date: 2014-12-11 15:03:52 +0100 (Thu, 11 Dec 2014)
New Revision: 34529
Added:
gnunet/contrib/no_forcestart.conf
Modified:
gnunet/contrib/Makefile.am
gnunet/src/arm/test_arm_api_data.conf
gnunet/src/core/test_core_defaults.conf
gnunet/src/datastore/test_datastore_api.c
gnunet/src/fs/test_fs_defaults.conf
gnunet/src/statistics/test_statistics_api_data.conf
gnunet/src/transport/test_transport_defaults.conf
Log:
adding single location for no_forcestart configuration list
Modified: gnunet/contrib/Makefile.am
===================================================================
--- gnunet/contrib/Makefile.am 2014-12-11 13:43:39 UTC (rev 34528)
+++ gnunet/contrib/Makefile.am 2014-12-11 14:03:52 UTC (rev 34529)
@@ -44,6 +44,7 @@
endif
EXTRA_DIST = \
+ no_forcestart.conf \
coverage.sh \
report.sh \
terminate.py.in \
Added: gnunet/contrib/no_forcestart.conf
===================================================================
--- gnunet/contrib/no_forcestart.conf (rev 0)
+++ gnunet/contrib/no_forcestart.conf 2014-12-11 14:03:52 UTC (rev 34529)
@@ -0,0 +1,29 @@
+# Configuration file that can be included to prevent ANY of the usual
+# FORCESTART = YES to be set. Also disables NSE POW calculation.
+#
+# This configuration is included from various configuration test files.
+# Whenever a new service is added that has FORCESTART = YES for
+# production should be disabled for (most) test suites, the option should
+# be added here instead of all over the place ;-).
+
+[core]
+FORCESTART = NO
+
+[fs]
+FORCESTART = NO
+
+[dht]
+FORCESTART = NO
+
+[cadet]
+FORCESTART = NO
+
+[nse]
+FORCESTART = NO
+WORKBITS = 0
+
+[revocation]
+FORCESTART = NO
+
+[topology]
+FORCESTART = NO
Modified: gnunet/src/arm/test_arm_api_data.conf
===================================================================
--- gnunet/src/arm/test_arm_api_data.conf 2014-12-11 13:43:39 UTC (rev
34528)
+++ gnunet/src/arm/test_arm_api_data.conf 2014-12-11 14:03:52 UTC (rev
34529)
@@ -1,5 +1,7 @@
address@hidden@ ../../contrib/no_forcestart.conf
+
[PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunetd-arm/
+GNUNET_TEST_HOME = /tmp/test-gnunet-arm/
[arm]
PORT = 23354
@@ -19,47 +21,6 @@
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-[fs]
-AUTOSTART = NO
-FORCESTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
-[transport]
-AUTOSTART = NO
-
-[peerinfo]
-AUTOSTART = NO
-
[statistics]
AUTOSTART = YES
-[dns]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-FORCESTART = NO
-
-[hostlist]
-AUTOSTART = NO
-FORCESTART = NO
-
-[dht]
-AUTOSTART = NO
-FORCESTART = NO
-
-[cadet]
-AUTOSTART = NO
-FORCESTART = NO
-
-[revocation]
-AUTOSTART = NO
-FORCESTART = NO
Modified: gnunet/src/core/test_core_defaults.conf
===================================================================
--- gnunet/src/core/test_core_defaults.conf 2014-12-11 13:43:39 UTC (rev
34528)
+++ gnunet/src/core/test_core_defaults.conf 2014-12-11 14:03:52 UTC (rev
34529)
@@ -1,3 +1,5 @@
address@hidden@ ../../contrib/no_forcestart.conf
+
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-core/
Modified: gnunet/src/datastore/test_datastore_api.c
===================================================================
--- gnunet/src/datastore/test_datastore_api.c 2014-12-11 13:43:39 UTC (rev
34528)
+++ gnunet/src/datastore/test_datastore_api.c 2014-12-11 14:03:52 UTC (rev
34529)
@@ -137,7 +137,10 @@
static void
-check_success (void *cls, int success, struct GNUNET_TIME_Absolute
min_expiration, const char *msg)
+check_success (void *cls,
+ int success,
+ struct GNUNET_TIME_Absolute min_expiration,
+ const char *msg)
{
struct CpsRunContext *crc = cls;
@@ -156,12 +159,16 @@
static void
-get_reserved (void *cls, int success, struct GNUNET_TIME_Absolute
min_expiration, const char *msg)
+get_reserved (void *cls,
+ int success,
+ struct GNUNET_TIME_Absolute min_expiration,
+ const char *msg)
{
struct CpsRunContext *crc = cls;
if (0 >= success)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error obtaining reservation: `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Error obtaining reservation: `%s'\n",
msg);
GNUNET_assert (0 < success);
crc->rid = success;
@@ -171,9 +178,14 @@
static void
-check_value (void *cls, const struct GNUNET_HashCode * key, size_t size,
- const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
- uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
+check_value (void *cls,
+ const struct GNUNET_HashCode *key,
+ size_t size,
+ const void *data,
+ enum GNUNET_BLOCK_Type type,
+ uint32_t priority,
+ uint32_t anonymity,
+ struct GNUNET_TIME_Absolute expiration,
uint64_t uid)
{
struct CpsRunContext *crc = cls;
@@ -183,7 +195,8 @@
if (NULL == key)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Value check failed (got NULL key) in %d/%d\n", crc->phase,
+ "Value check failed (got NULL key) in %d/%d\n",
+ crc->phase,
crc->i);
crc->phase = RP_ERROR;
GNUNET_SCHEDULER_add_continuation (&run_continuation, crc,
@@ -218,14 +231,19 @@
static void
-delete_value (void *cls, const struct GNUNET_HashCode * key, size_t size,
- const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
- uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
+delete_value (void *cls,
+ const struct GNUNET_HashCode *key,
+ size_t size,
+ const void *data,
+ enum GNUNET_BLOCK_Type type,
+ uint32_t priority,
+ uint32_t anonymity,
+ struct GNUNET_TIME_Absolute expiration,
uint64_t uid)
{
struct CpsRunContext *crc = cls;
- GNUNET_assert (crc->data == NULL);
+ GNUNET_assert (NULL == crc->data);
GNUNET_assert (NULL != key);
crc->size = size;
crc->key = *key;
@@ -254,10 +272,15 @@
static void
-check_multiple (void *cls, const struct GNUNET_HashCode * key, size_t size,
- const void *data, enum GNUNET_BLOCK_Type type,
- uint32_t priority, uint32_t anonymity,
- struct GNUNET_TIME_Absolute expiration, uint64_t uid)
+check_multiple (void *cls,
+ const struct GNUNET_HashCode *key,
+ size_t size,
+ const void *data,
+ enum GNUNET_BLOCK_Type type,
+ uint32_t priority,
+ uint32_t anonymity,
+ struct GNUNET_TIME_Absolute expiration,
+ uint64_t uid)
{
struct CpsRunContext *crc = cls;
@@ -286,9 +309,14 @@
static void
-check_update (void *cls, const struct GNUNET_HashCode * key, size_t size,
- const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
- uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
+check_update (void *cls,
+ const struct GNUNET_HashCode *key,
+ size_t size,
+ const void *data,
+ enum GNUNET_BLOCK_Type type,
+ uint32_t priority,
+ uint32_t anonymity,
+ struct GNUNET_TIME_Absolute expiration,
uint64_t uid)
{
struct CpsRunContext *crc = cls;
@@ -308,16 +336,21 @@
static void
-run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_continuation (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct CpsRunContext *crc = cls;
ok = (int) crc->phase;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test in phase %u\n", crc->phase);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Test in phase %u\n",
+ crc->phase);
switch (crc->phase)
{
case RP_PUT:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing `%s' number %u\n", "PUT",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Executing `%s' number %u\n",
+ "PUT",
crc->i);
GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key);
GNUNET_DATASTORE_put (datastore, 0, &crc->key, get_size (crc->i),
@@ -331,7 +364,9 @@
break;
case RP_GET:
crc->i--;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing `%s' number %u\n", "GET",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Executing `%s' number %u\n",
+ "GET",
crc->i);
GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key);
GNUNET_DATASTORE_get_key (datastore, crc->offset, &crc->key,
@@ -340,7 +375,9 @@
break;
case RP_DEL:
crc->i--;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing `%s' number %u\n", "DEL",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Executing `%s' number %u\n",
+ "DEL",
crc->i);
crc->data = NULL;
GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key);
@@ -350,7 +387,9 @@
&delete_value, crc));
break;
case RP_DO_DEL:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing `%s' number %u\n",
"DO_DEL",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Executing `%s' number %u\n",
+ "DO_DEL",
crc->i);
if (crc->i == 0)
{
@@ -368,7 +407,8 @@
break;
case RP_DELVALIDATE:
crc->i--;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing `%s' number %u\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Executing `%s' number %u\n",
"DEL-VALIDATE", crc->i);
GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key);
GNUNET_assert (NULL !=
@@ -435,7 +475,10 @@
static void
-run_tests (void *cls, int32_t success, struct GNUNET_TIME_Absolute
min_expiration, const char *msg)
+run_tests (void *cls,
+ int32_t success,
+ struct GNUNET_TIME_Absolute min_expiration,
+ const char *msg)
{
struct CpsRunContext *crc = cls;
@@ -446,7 +489,8 @@
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
return;
case GNUNET_NO:
- FPRINTF (stderr, "%s", "Test 'put' operation failed, key already exists
(!?)\n");
+ FPRINTF (stderr,
+ "%s", "Test 'put' operation failed, key already exists (!?)\n");
GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
GNUNET_free (crc);
return;
Modified: gnunet/src/fs/test_fs_defaults.conf
===================================================================
--- gnunet/src/fs/test_fs_defaults.conf 2014-12-11 13:43:39 UTC (rev 34528)
+++ gnunet/src/fs/test_fs_defaults.conf 2014-12-11 14:03:52 UTC (rev 34529)
@@ -1,3 +1,5 @@
address@hidden@ ../../contrib/no_forcestart.conf
+
[PATHS]
GNUNET_TEST_HOME = /tmp/gnunet-test-fs-lib/
Modified: gnunet/src/statistics/test_statistics_api_data.conf
===================================================================
--- gnunet/src/statistics/test_statistics_api_data.conf 2014-12-11 13:43:39 UTC
(rev 34528)
+++ gnunet/src/statistics/test_statistics_api_data.conf 2014-12-11 14:03:52 UTC
(rev 34529)
@@ -1,35 +1,5 @@
address@hidden@ ../../contrib/no_forcestart.conf
+
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-statistics/
-
-[statistics]
-PORT = 22353
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-statistics-service-statistics.unix
-
-[arm]
-PORT = 22354
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-statistics-service-arm.unix
-
-[hostlist]
-FORCESTART = NO
-
-[datastore]
-FORCESTART = NO
-
-[dht]
-FORCESTART = NO
-
-[nse]
-FORCESTART = NO
-
-[cadet]
-FORCESTART = NO
-
-[revocation]
-FORCESTART = NO
-
-[topology]
-FORCESTART = NO
-
-[fs]
-FORCESTART = NO
\ No newline at end of file
Modified: gnunet/src/transport/test_transport_defaults.conf
===================================================================
--- gnunet/src/transport/test_transport_defaults.conf 2014-12-11 13:43:39 UTC
(rev 34528)
+++ gnunet/src/transport/test_transport_defaults.conf 2014-12-11 14:03:52 UTC
(rev 34529)
@@ -1,3 +1,5 @@
address@hidden@ ../../contrib/no_forcestart.conf
+
[PATHS]
GNUNET_TEST_HOME = /tmp/test-transport-api/
@@ -5,77 +7,8 @@
TIMEOUT = 300 s
[transport]
-#PREFIX = valgrind -v --gen-suppressions=yes
+#PREFIX = valgrind -v --gen-suppressions=yes
-[core]
-AUTOSTART = NO
-FORCESTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-FORCESTART = NO
-
-[dht]
-AUTOSTART = NO
-FORCESTART = NO
-
-[cadet]
-AUTOSTART = NO
-FORCESTART = NO
-
-[nse]
-AUTOSTART = NO
-FORCESTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[peerstore]
-AUTOSTART = NO
-
-[identity]
-AUTOSTART = NO
-
-[namecache]
-AUTOSTART = NO
-
-[sensor]
-AUTOSTART = NO
-
-[set]
-AUTOSTART = NO
-
-[psycstore]
-AUTOSTART = NO
-
-[regex]
-AUTOSTART = NO
-
-[sensordashboard]
-AUTOSTART = NO
-
-[revocation]
-AUTOSTART = NO
-FORCESTART = NO
-
[nat]
DISABLEV6 = NO
RETURN_LOCAL_ADDRESSES = YES
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34529 - in gnunet: contrib src/arm src/core src/datastore src/fs src/statistics src/transport,
gnunet <=