aboutsummaryrefslogtreecommitdiff
path: root/src/namestore
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-05-09 18:18:35 +0200
committerChristian Grothoff <christian@grothoff.org>2018-05-09 18:18:35 +0200
commit5cb79daa75c50477e6cc370c647990122b783ac9 (patch)
tree533a5bd8a2d7c460dc0dc3ea73b36b7bf01b6635 /src/namestore
parentfede09823ee9b7e2dfad7cb9db10718761dda2d7 (diff)
downloadgnunet-5cb79daa75c50477e6cc370c647990122b783ac9.tar.gz
gnunet-5cb79daa75c50477e6cc370c647990122b783ac9.zip
fix config files
Diffstat (limited to 'src/namestore')
-rw-r--r--src/namestore/perf_namestore_api_flat.conf3
-rw-r--r--src/namestore/perf_namestore_api_postgres.conf4
-rw-r--r--src/namestore/perf_namestore_api_sqlite.conf3
-rw-r--r--src/namestore/perf_namestore_api_zone_iteration.c18
4 files changed, 14 insertions, 14 deletions
diff --git a/src/namestore/perf_namestore_api_flat.conf b/src/namestore/perf_namestore_api_flat.conf
index 26e2f2c51..f356e9061 100644
--- a/src/namestore/perf_namestore_api_flat.conf
+++ b/src/namestore/perf_namestore_api_flat.conf
@@ -5,3 +5,6 @@ DATABASE = flat
5 5
6[namecache] 6[namecache]
7DISABLE = YES 7DISABLE = YES
8
9[namestore-flat]
10FILENAME = $GNUNET_TEST_HOME/namestore/flat.db
diff --git a/src/namestore/perf_namestore_api_postgres.conf b/src/namestore/perf_namestore_api_postgres.conf
index 259ce35e7..16f530252 100644
--- a/src/namestore/perf_namestore_api_postgres.conf
+++ b/src/namestore/perf_namestore_api_postgres.conf
@@ -5,3 +5,7 @@ DATABASE = postgres
5 5
6[namecache] 6[namecache]
7DISABLE = YES 7DISABLE = YES
8
9[namestore-postgres]
10CONFIG = connect_timeout=10; dbname=gnunetcheck
11TEMPORARY_TABLE = YES
diff --git a/src/namestore/perf_namestore_api_sqlite.conf b/src/namestore/perf_namestore_api_sqlite.conf
index 72b609226..de0fa3f1f 100644
--- a/src/namestore/perf_namestore_api_sqlite.conf
+++ b/src/namestore/perf_namestore_api_sqlite.conf
@@ -2,3 +2,6 @@
2 2
3[namecache] 3[namecache]
4DISABLE = YES 4DISABLE = YES
5
6[namestore-sqlite]
7FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db
diff --git a/src/namestore/perf_namestore_api_zone_iteration.c b/src/namestore/perf_namestore_api_zone_iteration.c
index 4ef8d3407..55d6fafa0 100644
--- a/src/namestore/perf_namestore_api_zone_iteration.c
+++ b/src/namestore/perf_namestore_api_zone_iteration.c
@@ -69,8 +69,6 @@ static struct GNUNET_NAMESTORE_QueueEntry *qe;
69 69
70static int res; 70static int res;
71 71
72static char *directory;
73
74static unsigned int off; 72static unsigned int off;
75 73
76static unsigned int left_until_next; 74static unsigned int left_until_next;
@@ -333,13 +331,6 @@ run (void *cls,
333 const struct GNUNET_CONFIGURATION_Handle *cfg, 331 const struct GNUNET_CONFIGURATION_Handle *cfg,
334 struct GNUNET_TESTING_Peer *peer) 332 struct GNUNET_TESTING_Peer *peer)
335{ 333{
336 directory = NULL;
337 GNUNET_assert (GNUNET_OK ==
338 GNUNET_CONFIGURATION_get_value_string(cfg,
339 "PATHS",
340 "GNUNET_TEST_HOME",
341 &directory));
342 GNUNET_DISK_directory_remove (directory);
343 GNUNET_SCHEDULER_add_shutdown (&end, 334 GNUNET_SCHEDULER_add_shutdown (&end,
344 NULL); 335 NULL);
345 timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, 336 timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
@@ -367,6 +358,8 @@ main (int argc,
367 "perf_namestore_api_%s.conf", 358 "perf_namestore_api_%s.conf",
368 plugin_name); 359 plugin_name);
369 res = 1; 360 res = 1;
361 GNUNET_DISK_purge_cfg_dir (cfg_name,
362 "GNUNET_TEST_HOME");
370 if (0 != 363 if (0 !=
371 GNUNET_TESTING_peer_run ("perf-namestore-api-zone-iteration", 364 GNUNET_TESTING_peer_run ("perf-namestore-api-zone-iteration",
372 cfg_name, 365 cfg_name,
@@ -375,12 +368,9 @@ main (int argc,
375 { 368 {
376 res = 1; 369 res = 1;
377 } 370 }
371 GNUNET_DISK_purge_cfg_dir (cfg_name,
372 "GNUNET_TEST_HOME");
378 GNUNET_free (cfg_name); 373 GNUNET_free (cfg_name);
379 if (NULL != directory)
380 {
381 GNUNET_DISK_directory_remove (directory);
382 GNUNET_free (directory);
383 }
384 return res; 374 return res;
385} 375}
386 376