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_store.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_store.c')
-rw-r--r-- | src/namestore/test_namestore_api_store.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c index c44d24809..a7a1f2bbc 100644 --- a/src/namestore/test_namestore_api_store.c +++ b/src/namestore/test_namestore_api_store.c | |||
@@ -61,11 +61,6 @@ cleanup () | |||
61 | GNUNET_free (privkey); | 61 | GNUNET_free (privkey); |
62 | privkey = NULL; | 62 | privkey = NULL; |
63 | } | 63 | } |
64 | if (NULL != directory) | ||
65 | { | ||
66 | GNUNET_DISK_directory_remove (directory); | ||
67 | GNUNET_free (directory); | ||
68 | } | ||
69 | GNUNET_SCHEDULER_shutdown (); | 64 | GNUNET_SCHEDULER_shutdown (); |
70 | } | 65 | } |
71 | 66 | ||
@@ -125,6 +120,7 @@ run (void *cls, | |||
125 | 120 | ||
126 | directory = NULL; | 121 | directory = NULL; |
127 | GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory); | 122 | GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory); |
123 | GNUNET_DISK_directory_remove (directory); | ||
128 | 124 | ||
129 | endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, | 125 | endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, |
130 | &endbadly, NULL); | 126 | &endbadly, NULL); |
@@ -169,7 +165,14 @@ main (int argc, char *argv[]) | |||
169 | "test_namestore_api.conf", | 165 | "test_namestore_api.conf", |
170 | &run, | 166 | &run, |
171 | NULL)) | 167 | NULL)) |
172 | return 1; | 168 | { |
169 | res = 1; | ||
170 | } | ||
171 | if (NULL != directory) | ||
172 | { | ||
173 | GNUNET_DISK_directory_remove (directory); | ||
174 | GNUNET_free (directory); | ||
175 | } | ||
173 | return res; | 176 | return res; |
174 | } | 177 | } |
175 | 178 | ||