diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-10-20 13:25:50 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-10-20 13:25:50 +0000 |
commit | 85e2435610b558e583f10eb6fe5a8f73d7aab3a7 (patch) | |
tree | dbdd0c95e59887bc73c5fd357e323f39f4cfa844 /src/dht | |
parent | 9b68602172984414812bd244c06e3786716a7471 (diff) | |
download | gnunet-85e2435610b558e583f10eb6fe5a8f73d7aab3a7.tar.gz gnunet-85e2435610b558e583f10eb6fe5a8f73d7aab3a7.zip |
fix
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/test_dht_2dtorus.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/dht/test_dht_2dtorus.c b/src/dht/test_dht_2dtorus.c index eebd2ea2e..d5acbbcb3 100644 --- a/src/dht/test_dht_2dtorus.c +++ b/src/dht/test_dht_2dtorus.c | |||
@@ -416,17 +416,9 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
416 | GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing", | 416 | GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing", |
417 | "num_peers", &num_peers)) | 417 | "num_peers", &num_peers)) |
418 | { | 418 | { |
419 | GNUNET_assert (GNUNET_OK == | 419 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
420 | GNUNET_CONFIGURATION_load (testing_cfg, | 420 | "Option TESTING:NUM_PEERS is required!\n"); |
421 | "test_dht_2dtorus.conf")); | 421 | return; |
422 | if (GNUNET_OK != | ||
423 | GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing", | ||
424 | "num_peers", &num_peers)) | ||
425 | { | ||
426 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
427 | "Option TESTING:NUM_PEERS is required!\n"); | ||
428 | return; | ||
429 | } | ||
430 | } | 422 | } |
431 | 423 | ||
432 | if (GNUNET_OK != | 424 | if (GNUNET_OK != |
@@ -506,9 +498,18 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = { | |||
506 | * Main: start test | 498 | * Main: start test |
507 | */ | 499 | */ |
508 | int | 500 | int |
509 | main (int argc, char *argv[]) | 501 | main (int xargc, char *xargv[]) |
510 | { | 502 | { |
511 | GNUNET_PROGRAM_run (argc, argv, "test_dht_2dtorus", | 503 | char *const argv[] = { "test-dht-2dtorus", |
504 | "-c", | ||
505 | "test_dht_2dtorus.conf", | ||
506 | #if VERBOSE | ||
507 | "-L", "DEBUG", | ||
508 | #endif | ||
509 | NULL | ||
510 | }; | ||
511 | |||
512 | GNUNET_PROGRAM_run (sizeof(argv)/sizeof(char*) - 1, argv, "test_dht_2dtorus", | ||
512 | gettext_noop ("Test dht in a small 2D torus."), options, | 513 | gettext_noop ("Test dht in a small 2D torus."), options, |
513 | &run, NULL); | 514 | &run, NULL); |
514 | #if REMOVE_DIR | 515 | #if REMOVE_DIR |