diff options
author | LRN <lrn1986@gmail.com> | 2013-12-09 17:53:31 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-12-09 17:53:31 +0000 |
commit | cc57e1d42bbfee97247ad7ea1db3fa81ecbf2c08 (patch) | |
tree | a1239bef1cb83eed339459d24dad5e69f27c8aa1 /src/namestore/test_namestore_api_lookup_nick.c | |
parent | 2d828dcdcd023b9361b11491254d08f122c142b1 (diff) | |
download | gnunet-cc57e1d42bbfee97247ad7ea1db3fa81ecbf2c08.tar.gz gnunet-cc57e1d42bbfee97247ad7ea1db3fa81ecbf2c08.zip |
Remove test home at the beginning and at the VERY end
Diffstat (limited to 'src/namestore/test_namestore_api_lookup_nick.c')
-rw-r--r-- | src/namestore/test_namestore_api_lookup_nick.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c index 9cefc8a13..093fa17ed 100644 --- a/src/namestore/test_namestore_api_lookup_nick.c +++ b/src/namestore/test_namestore_api_lookup_nick.c | |||
@@ -68,11 +68,6 @@ cleanup () | |||
68 | GNUNET_free (privkey); | 68 | GNUNET_free (privkey); |
69 | privkey = NULL; | 69 | privkey = NULL; |
70 | } | 70 | } |
71 | if (NULL != directory) | ||
72 | { | ||
73 | GNUNET_DISK_directory_remove (directory); | ||
74 | GNUNET_free (directory); | ||
75 | } | ||
76 | GNUNET_SCHEDULER_shutdown (); | 71 | GNUNET_SCHEDULER_shutdown (); |
77 | } | 72 | } |
78 | 73 | ||
@@ -276,6 +271,7 @@ run (void *cls, | |||
276 | 271 | ||
277 | directory = NULL; | 272 | directory = NULL; |
278 | GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory); | 273 | GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory); |
274 | GNUNET_DISK_directory_remove (directory); | ||
279 | 275 | ||
280 | endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, | 276 | endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, |
281 | &endbadly, NULL); | 277 | &endbadly, NULL); |
@@ -310,7 +306,14 @@ main (int argc, char *argv[]) | |||
310 | "test_namestore_api.conf", | 306 | "test_namestore_api.conf", |
311 | &run, | 307 | &run, |
312 | NULL)) | 308 | NULL)) |
313 | return 1; | 309 | { |
310 | res = 1; | ||
311 | } | ||
312 | if (NULL != directory) | ||
313 | { | ||
314 | GNUNET_DISK_directory_remove (directory); | ||
315 | GNUNET_free (directory); | ||
316 | } | ||
314 | return res; | 317 | return res; |
315 | } | 318 | } |
316 | 319 | ||