From 64e2672793e7111966db2b4ec8fd440f8da28d55 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 23 Feb 2010 09:17:56 +0000 Subject: rename --- src/fs/Makefile.am | 1 + src/fs/fs_test_lib.c | 2 +- src/fs/fs_test_lib_data.conf | 54 ++++++++++++++++++++++++++++++++++++++++++++ src/fs/test_fs_lib_data.conf | 54 -------------------------------------------- 4 files changed, 56 insertions(+), 55 deletions(-) create mode 100644 src/fs/fs_test_lib_data.conf delete mode 100644 src/fs/test_fs_lib_data.conf (limited to 'src/fs') diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index fa5ed090e..ee476e6e0 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -239,6 +239,7 @@ test_gnunet_service_fs_p2p_LDADD = \ EXTRA_DIST = \ + fs_test_lib_data.conf \ test_fs_data.conf \ test_fs_collection_data.conf \ test_fs_download_data.conf \ diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c index 1687aa7e9..1e3fa7f20 100644 --- a/src/fs/fs_test_lib.c +++ b/src/fs/fs_test_lib.c @@ -327,7 +327,7 @@ GNUNET_FS_TEST_daemons_start (struct GNUNET_SCHEDULER_Handle *sched, sctx->cfg = GNUNET_CONFIGURATION_create (); if (GNUNET_OK != GNUNET_CONFIGURATION_load (sctx->cfg, - "test_fs_lib_data.conf")) + "fs_test_lib_data.conf")) { GNUNET_break (0); GNUNET_CONFIGURATION_destroy (sctx->cfg); diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf new file mode 100644 index 000000000..23cb948c4 --- /dev/null +++ b/src/fs/fs_test_lib_data.conf @@ -0,0 +1,54 @@ +[PATHS] +SERVICEHOME = /tmp/gnunet-test-fs-lib/ +DEFAULTCONFIG = test_fs_lib_data.conf + +[gnunetd] +HOSTKEY = $SERVICEHOME/.hostkey + +[resolver] +PORT = 43464 +HOSTNAME = localhost + +[transport] +PORT = 43465 +PLUGINS = tcp +#DEBUG = YES + +[arm] +PORT = 43466 +HOSTNAME = localhost +DEFAULTSERVICES = resolver datastore transport core fs peerinfo + +[datastore] +#DEBUG = YES + +[statistics] +PORT = 43467 +HOSTNAME = localhost + +[transport-tcp] +ALLOW_SHUTDOWN = NO +TIMEOUT = 300000 +#PORT = 43468 + +[peerinfo] +PORT = 43469 +HOSTNAME = localhost + +[core] +PORT = 43470 +HOSTNAME = localhost +#TOTAL_QUOTA_IN = 3932160 +#TOTAL_QUOTA_OUT = 3932160 +#DEBUG = YES + +[fs] +PORT = 43471 +HOSTNAME = localhost +DEBUG = YES +#PREFIX = valgrind --tool=memcheck --leak-check=yes +#BINARY = /home/grothoff/bin/gnunet-service-fs +#PREFIX = xterm -e gdb -x cmd --args + +[testing] +WEAKRANDOM = YES diff --git a/src/fs/test_fs_lib_data.conf b/src/fs/test_fs_lib_data.conf deleted file mode 100644 index 23cb948c4..000000000 --- a/src/fs/test_fs_lib_data.conf +++ /dev/null @@ -1,54 +0,0 @@ -[PATHS] -SERVICEHOME = /tmp/gnunet-test-fs-lib/ -DEFAULTCONFIG = test_fs_lib_data.conf - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 43464 -HOSTNAME = localhost - -[transport] -PORT = 43465 -PLUGINS = tcp -#DEBUG = YES - -[arm] -PORT = 43466 -HOSTNAME = localhost -DEFAULTSERVICES = resolver datastore transport core fs peerinfo - -[datastore] -#DEBUG = YES - -[statistics] -PORT = 43467 -HOSTNAME = localhost - -[transport-tcp] -ALLOW_SHUTDOWN = NO -TIMEOUT = 300000 -#PORT = 43468 - -[peerinfo] -PORT = 43469 -HOSTNAME = localhost - -[core] -PORT = 43470 -HOSTNAME = localhost -#TOTAL_QUOTA_IN = 3932160 -#TOTAL_QUOTA_OUT = 3932160 -#DEBUG = YES - -[fs] -PORT = 43471 -HOSTNAME = localhost -DEBUG = YES -#PREFIX = valgrind --tool=memcheck --leak-check=yes -#BINARY = /home/grothoff/bin/gnunet-service-fs -#PREFIX = xterm -e gdb -x cmd --args - -[testing] -WEAKRANDOM = YES -- cgit v1.2.3