aboutsummaryrefslogtreecommitdiff
path: root/src/hostlist
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-06-01 18:44:47 +0000
committerChristian Grothoff <christian@grothoff.org>2012-06-01 18:44:47 +0000
commit80c21063a01acb7529929b5ece6b3edcf98ef9a3 (patch)
tree186707c64e5be2e085e28a95bcac0c92e00c8571 /src/hostlist
parent82c369965be151340fa9738305e23cff93297f0f (diff)
downloadgnunet-80c21063a01acb7529929b5ece6b3edcf98ef9a3.tar.gz
gnunet-80c21063a01acb7529929b5ece6b3edcf98ef9a3.zip
-fix
Diffstat (limited to 'src/hostlist')
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist.c10
-rw-r--r--src/hostlist/test_hostlist_defaults.conf2
2 files changed, 1 insertions, 11 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index a81a7f7a4..f13f86dfa 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -142,9 +142,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
142 p->arm_proc = 142 p->arm_proc =
143 GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", 143 GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
144 "gnunet-service-arm", 144 "gnunet-service-arm",
145#if VERBOSE
146 "-L", "DEBUG",
147#endif
148 "-c", cfgname, NULL); 145 "-c", cfgname, NULL);
149#endif 146#endif
150 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); 147 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
@@ -213,9 +210,6 @@ check ()
213{ 210{
214 char *const argv[] = { "test-gnunet-daemon-hostlist", 211 char *const argv[] = { "test-gnunet-daemon-hostlist",
215 "-c", "test_gnunet_daemon_hostlist_data.conf", 212 "-c", "test_gnunet_daemon_hostlist_data.conf",
216#if VERBOSE
217 "-L", "DEBUG",
218#endif
219 NULL 213 NULL
220 }; 214 };
221 struct GNUNET_GETOPT_CommandLineOption options[] = { 215 struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -239,11 +233,7 @@ main (int argc, char *argv[])
239 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2"); 233 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
240 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist"); 234 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist");
241 GNUNET_log_setup ("test-gnunet-daemon-hostlist", 235 GNUNET_log_setup ("test-gnunet-daemon-hostlist",
242#if VERBOSE
243 "DEBUG",
244#else
245 "WARNING", 236 "WARNING",
246#endif
247 NULL); 237 NULL);
248 ret = check (); 238 ret = check ();
249 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1"); 239 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index 33864343d..c2d0a70d2 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -64,5 +64,5 @@ AUTOSTART = NO
64[namestore] 64[namestore]
65AUTOSTART = NO 65AUTOSTART = NO
66 66
67[lockamanger] 67[lockmanager]
68AUTOSTART = NO 68AUTOSTART = NO