diff options
| author | Bertrand Marc <beberking@gmail.com> | 2012-06-06 20:47:50 +0200 |
|---|---|---|
| committer | Bertrand Marc <beberking@gmail.com> | 2012-06-06 20:47:50 +0200 |
| commit | 15d0a119987bc62675a17dea2c24b652a42c53e3 (patch) | |
| tree | d6598fb09c24a8004da21bee1a19f3f1ea37c66c /src/peerinfo/test_peerinfo_api.c | |
| parent | c47dd4e3165b7894669d8f7f800bac75ac8ad95c (diff) | |
| parent | 740b30688bd745a527f96f9116c19acb3480971a (diff) | |
Merge tag 'upstream/0.9.3'
Upstream version 0.9.3
Diffstat (limited to 'src/peerinfo/test_peerinfo_api.c')
| -rw-r--r-- | src/peerinfo/test_peerinfo_api.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c index 71da46b..e66878e 100644 --- a/src/peerinfo/test_peerinfo_api.c +++ b/src/peerinfo/test_peerinfo_api.c @@ -96,7 +96,7 @@ add_peer () memset (&pkey, 32, sizeof (pkey)); GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey); h2 = GNUNET_HELLO_create (&pkey, &address_generator, &agc); - GNUNET_PEERINFO_add_peer (h, h2); + GNUNET_PEERINFO_add_peer (h, h2, NULL, NULL); GNUNET_free (h2); } @@ -170,9 +170,6 @@ check () char *const argv[] = { "test-peerinfo-api", "-c", "test_peerinfo_api_data.conf", -#if DEBUG_PEERINFO - "-L", "DEBUG", -#endif NULL }; struct GNUNET_GETOPT_CommandLineOption options[] = { @@ -181,9 +178,6 @@ check () proc = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-peerinfo", "gnunet-service-peerinfo", -#if DEBUG_PEERINFO - "-L", "DEBUG", -#endif "-c", "test_peerinfo_api_data.conf", NULL); GNUNET_assert (NULL != proc); GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, @@ -194,7 +188,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; return ok; } @@ -205,12 +199,9 @@ main (int argc, char *argv[]) { int ret = 0; + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-peerinfo"); GNUNET_log_setup ("test_peerinfo_api", -#if DEBUG_PEERINFO - "DEBUG", -#else "WARNING", -#endif NULL); ret = check (); GNUNET_DISK_directory_remove ("/tmp/test-gnunet-peerinfo"); |