aboutsummaryrefslogtreecommitdiff
path: root/src/fs/test_fs_search_ranking.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-11-03 21:26:40 +0000
committerChristian Grothoff <christian@grothoff.org>2010-11-03 21:26:40 +0000
commit721e49caeea6ba5073f8bc5c6c08359295c02bb5 (patch)
treee06e80ba90af91e9452a48a7a5782913199b4877 /src/fs/test_fs_search_ranking.c
parent37ac1b7c9e9e05f93d4100cfb53450ec2d370989 (diff)
downloadgnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.tar.gz
gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.zip
original patch from Mantis 1614
Diffstat (limited to 'src/fs/test_fs_search_ranking.c')
-rw-r--r--src/fs/test_fs_search_ranking.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fs/test_fs_search_ranking.c b/src/fs/test_fs_search_ranking.c
index 8c75bc1b1..06a069a32 100644
--- a/src/fs/test_fs_search_ranking.c
+++ b/src/fs/test_fs_search_ranking.c
@@ -126,7 +126,7 @@ int
126main (int argc, char *argv[]) 126main (int argc, char *argv[])
127{ 127{
128#if START_DAEMON 128#if START_DAEMON
129 pid_t daemon; 129 GNUNET_OS_Process *daemon;
130#endif 130#endif
131 int ok; 131 int ok;
132 char *fn = NULL; 132 char *fn = NULL;
@@ -153,7 +153,7 @@ main (int argc, char *argv[])
153#if START_DAEMON 153#if START_DAEMON
154 GNUNET_disk_directory_remove (NULL, "/tmp/gnunet-fsui-searchranktest/"); 154 GNUNET_disk_directory_remove (NULL, "/tmp/gnunet-fsui-searchranktest/");
155 daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO); 155 daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO);
156 GNUNET_GE_ASSERT (NULL, daemon > 0); 156 GNUNET_GE_ASSERT (NULL, daemon != NULL);
157 CHECK (GNUNET_OK == 157 CHECK (GNUNET_OK ==
158 GNUNET_wait_for_daemon_running (NULL, cfg, 158 GNUNET_wait_for_daemon_running (NULL, cfg,
159 30 * GNUNET_CRON_SECONDS)); 159 30 * GNUNET_CRON_SECONDS));
@@ -242,6 +242,8 @@ FAILURE:
242 242
243#if START_DAEMON 243#if START_DAEMON
244 GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); 244 GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon));
245 GNUNET_OS_process_close (daemon);
246 daemon = NULL;
245#endif 247#endif
246 GNUNET_GC_free (cfg); 248 GNUNET_GC_free (cfg);
247 return (ok == GNUNET_YES) ? 0 : 1; 249 return (ok == GNUNET_YES) ? 0 : 1;