aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2012-06-28 12:11:50 +0000
committerMartin Schanzenbach <mschanzenbach@posteo.de>2012-06-28 12:11:50 +0000
commitbd02c042590c3294cb8e13a852b92f1e254e9e6f (patch)
treefff5faeeb8908ff0a9994c77639013f7d9540d1f /src
parent146d71432ed366ccd3e576f4b3e261ace67cf757 (diff)
downloadgnunet-bd02c042590c3294cb8e13a852b92f1e254e9e6f.tar.gz
gnunet-bd02c042590c3294cb8e13a852b92f1e254e9e6f.zip
-fix
Diffstat (limited to 'src')
-rw-r--r--src/gns/test_gns_simple_zkey_lookup.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c
index 6645be279..19dbc6a9b 100644
--- a/src/gns/test_gns_simple_zkey_lookup.c
+++ b/src/gns/test_gns_simple_zkey_lookup.c
@@ -37,7 +37,7 @@
37#define VERBOSE GNUNET_YES 37#define VERBOSE GNUNET_YES
38 38
39/* Timeout for entire testcase */ 39/* Timeout for entire testcase */
40#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20) 40#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 40)
41 41
42/* If number of peers not in config file, use this number */ 42/* If number of peers not in config file, use this number */
43#define DEFAULT_NUM_PEERS 2 43#define DEFAULT_NUM_PEERS 2
@@ -101,7 +101,7 @@ on_lookup_result(void *cls, uint32_t rd_count,
101 if (rd_count == 0) 101 if (rd_count == 0)
102 { 102 {
103 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 103 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
104 "Lookup failed, rp_filtering?\n"); 104 "Lookup failed\n");
105 ok = 2; 105 ok = 2;
106 } 106 }
107 else 107 else
@@ -314,12 +314,9 @@ check ()
314 int ret; 314 int ret;
315 315
316 /* Arguments for GNUNET_PROGRAM_run */ 316 /* Arguments for GNUNET_PROGRAM_run */
317 char *const argv[] = { "test-gns-simple-delegated-lookup", /* Name to give running binary */ 317 char *const argv[] = { "test-gns-simple-zkey-lookup", /* Name to give running binary */
318 "-c", 318 "-c",
319 "test_gns_simple_lookup.conf", /* Config file to use */ 319 "test_gns_simple_lookup.conf", /* Config file to use */
320#if VERBOSE
321 "-L", "DEBUG",
322#endif
323 NULL 320 NULL
324 }; 321 };
325 struct GNUNET_GETOPT_CommandLineOption options[] = { 322 struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -328,12 +325,12 @@ check ()
328 /* Run the run function as a new program */ 325 /* Run the run function as a new program */
329 ret = 326 ret =
330 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, 327 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
331 "test-gns-simple-delegated-lookup", "nohelp", options, &run, 328 "test-gns-simple-zkey-lookup", "nohelp", options, &run,
332 &ok); 329 &ok);
333 if (ret != GNUNET_OK) 330 if (ret != GNUNET_OK)
334 { 331 {
335 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 332 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
336 "`test-gns-simple-delegated-lookup': Failed with error code %d\n", ret); 333 "`test-gns-simple-zkey-lookup': Failed with error code %d\n", ret);
337 } 334 }
338 return ok; 335 return ok;
339} 336}
@@ -343,12 +340,8 @@ main (int argc, char *argv[])
343{ 340{
344 int ret; 341 int ret;
345 342
346 GNUNET_log_setup ("test-gns-simple-lookup", 343 GNUNET_log_setup ("test-gns-simple-zkey-lookup",
347#if VERBOSE
348 "DEBUG",
349#else
350 "WARNING", 344 "WARNING",
351#endif
352 NULL); 345 NULL);
353 ret = check (); 346 ret = check ();
354 /** 347 /**