diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-01 18:41:19 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-01 18:41:19 +0000 |
commit | 78678202a07f59d08ec5efbcba9938363341a0f9 (patch) | |
tree | 01148bba0da2525e3f4f4507367130a8f2588f59 /src | |
parent | 63a57830d1af592eefeb2c3ea639ccd13f928b4a (diff) | |
download | gnunet-78678202a07f59d08ec5efbcba9938363341a0f9.tar.gz gnunet-78678202a07f59d08ec5efbcba9938363341a0f9.zip |
-cleanup
Diffstat (limited to 'src')
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_learning.c | 19 | ||||
-rw-r--r-- | src/hostlist/test_hostlist_defaults.conf | 3 |
2 files changed, 5 insertions, 17 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 58c92d3d6..08ab0dedb 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors) | 3 | (C) 2009, 2010, 2011, 2012 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file hostlist/test_gnunet_daemon_hostlist.c | 21 | * @file hostlist/test_gnunet_daemon_hostlist_learning.c |
22 | * @brief test for gnunet_daemon_hostslist.c | 22 | * @brief test for gnunet_daemon_hostslist.c |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
@@ -30,8 +30,6 @@ | |||
30 | #include "gnunet_resolver_service.h" | 30 | #include "gnunet_resolver_service.h" |
31 | #include "gnunet_statistics_service.h" | 31 | #include "gnunet_statistics_service.h" |
32 | 32 | ||
33 | #define VERBOSE GNUNET_NO | ||
34 | |||
35 | #define START_ARM GNUNET_YES | 33 | #define START_ARM GNUNET_YES |
36 | 34 | ||
37 | #define MAX_URL_LEN 1000 | 35 | #define MAX_URL_LEN 1000 |
@@ -396,9 +394,6 @@ setup_learn_peer (struct PeerContext *p, const char *cfgname) | |||
396 | p->arm_proc = | 394 | p->arm_proc = |
397 | GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", | 395 | GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", |
398 | "gnunet-service-arm", | 396 | "gnunet-service-arm", |
399 | #if VERBOSE | ||
400 | "-L", "DEBUG", | ||
401 | #endif | ||
402 | "-c", cfgname, NULL); | 397 | "-c", cfgname, NULL); |
403 | #endif | 398 | #endif |
404 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 399 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
@@ -432,9 +427,6 @@ setup_adv_peer (struct PeerContext *p, const char *cfgname) | |||
432 | p->arm_proc = | 427 | p->arm_proc = |
433 | GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", | 428 | GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", |
434 | "gnunet-service-arm", | 429 | "gnunet-service-arm", |
435 | #if VERBOSE | ||
436 | "-L", "DEBUG", | ||
437 | #endif | ||
438 | "-c", cfgname, NULL); | 430 | "-c", cfgname, NULL); |
439 | #endif | 431 | #endif |
440 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 432 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
@@ -473,9 +465,6 @@ check () | |||
473 | char *const argv[] = { | 465 | char *const argv[] = { |
474 | "test-gnunet-daemon-hostlist-learning", | 466 | "test-gnunet-daemon-hostlist-learning", |
475 | "-c", "learning_data.conf", | 467 | "-c", "learning_data.conf", |
476 | #if VERBOSE | ||
477 | "-L", "DEBUG", | ||
478 | #endif | ||
479 | NULL | 468 | NULL |
480 | }; | 469 | }; |
481 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 470 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
@@ -529,11 +518,7 @@ main (int argc, char *argv[]) | |||
529 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1"); | 518 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1"); |
530 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2"); | 519 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2"); |
531 | GNUNET_log_setup ("test-gnunet-daemon-hostlist", | 520 | GNUNET_log_setup ("test-gnunet-daemon-hostlist", |
532 | #if VERBOSE | ||
533 | "DEBUG", | ||
534 | #else | ||
535 | "WARNING", | 521 | "WARNING", |
536 | #endif | ||
537 | NULL); | 522 | NULL); |
538 | #if !WINDOWS | 523 | #if !WINDOWS |
539 | system ("gnunet-peerinfo -s -c test_learning_adv_peer.conf > /dev/null"); | 524 | system ("gnunet-peerinfo -s -c test_learning_adv_peer.conf > /dev/null"); |
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf index 1fac24617..33864343d 100644 --- a/src/hostlist/test_hostlist_defaults.conf +++ b/src/hostlist/test_hostlist_defaults.conf | |||
@@ -63,3 +63,6 @@ AUTOSTART = NO | |||
63 | 63 | ||
64 | [namestore] | 64 | [namestore] |
65 | AUTOSTART = NO | 65 | AUTOSTART = NO |
66 | |||
67 | [lockamanger] | ||
68 | AUTOSTART = NO | ||