diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-02-24 10:30:30 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-02-24 10:30:30 +0100 |
commit | da24a3606f55c66d8e1ce283661640e491489870 (patch) | |
tree | 4c4ba67e2e068b22bc3fd730a484587b532bf5e7 /src/namestore | |
parent | 0b5dc8a620fca8dbca9c122594b70267e404859f (diff) | |
download | gnunet-da24a3606f55c66d8e1ce283661640e491489870.tar.gz gnunet-da24a3606f55c66d8e1ce283661640e491489870.zip |
avoid failing hard if 'gnunetcheck' db does not exist
(or plugins cannot be loaded for other reasons)
Diffstat (limited to 'src/namestore')
-rw-r--r-- | src/namestore/test_namestore_api_lookup_shadow.c | 10 | ||||
-rw-r--r-- | src/namestore/test_namestore_api_remove.c | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/namestore/test_namestore_api_lookup_shadow.c b/src/namestore/test_namestore_api_lookup_shadow.c index f26593bb0..1938054d4 100644 --- a/src/namestore/test_namestore_api_lookup_shadow.c +++ b/src/namestore/test_namestore_api_lookup_shadow.c | |||
@@ -258,18 +258,16 @@ run (void *cls, | |||
258 | } | 258 | } |
259 | 259 | ||
260 | 260 | ||
261 | #include "test_common.c" | ||
262 | |||
263 | |||
261 | int | 264 | int |
262 | main (int argc, char *argv[]) | 265 | main (int argc, char *argv[]) |
263 | { | 266 | { |
264 | const char *plugin_name; | 267 | const char *plugin_name; |
265 | char *cfg_name; | 268 | char *cfg_name; |
266 | 269 | ||
267 | plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]); | 270 | SETUP_CFG (plugin_name, cfg_name); |
268 | GNUNET_asprintf (&cfg_name, | ||
269 | "test_namestore_api_%s.conf", | ||
270 | plugin_name); | ||
271 | GNUNET_DISK_purge_cfg_dir (cfg_name, | ||
272 | "GNUNET_TEST_HOME"); | ||
273 | res = 1; | 271 | res = 1; |
274 | if (0 != | 272 | if (0 != |
275 | GNUNET_TESTING_peer_run ("test-namestore-api-lookup-shadow", | 273 | GNUNET_TESTING_peer_run ("test-namestore-api-lookup-shadow", |
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 02c2672aa..4c3d55efc 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c | |||
@@ -197,18 +197,16 @@ run (void *cls, | |||
197 | } | 197 | } |
198 | 198 | ||
199 | 199 | ||
200 | #include "test_common.c" | ||
201 | |||
202 | |||
200 | int | 203 | int |
201 | main (int argc, char *argv[]) | 204 | main (int argc, char *argv[]) |
202 | { | 205 | { |
203 | const char *plugin_name; | 206 | const char *plugin_name; |
204 | char *cfg_name; | 207 | char *cfg_name; |
205 | 208 | ||
206 | plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]); | 209 | SETUP_CFG (plugin_name, cfg_name); |
207 | GNUNET_asprintf (&cfg_name, | ||
208 | "test_namestore_api_%s.conf", | ||
209 | plugin_name); | ||
210 | GNUNET_DISK_purge_cfg_dir (cfg_name, | ||
211 | "GNUNET_TEST_HOME"); | ||
212 | res = 1; | 210 | res = 1; |
213 | if (0 != | 211 | if (0 != |
214 | GNUNET_TESTING_peer_run ("test-namestore-api-remove", | 212 | GNUNET_TESTING_peer_run ("test-namestore-api-remove", |