-Replaced several hardcoded /tmp locations in tests of CORE, FS, IDENTITY, NAMECHACHE, PT, TOPOLOGY, and TESTBED subsystems

6 files changed, 18 insertions, 7 deletions

diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c
index 062f062b5..2c7830f5f 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -360,7 +360,9 @@ main (int argc, char *argv[])
                                   NUM_DAEMONS,
                                   0, NULL, NULL,
                                   &do_publish, NULL);
-  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+  GNUNET_DISK_purge_cfg_dir 
+    ("perf_gnunet_service_fs_p2p.conf",
+     "GNUNET_TEST_HOME");
   return ok;
 }
 
diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c
index c48db2383..6b71b1f93 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_respect.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c
@@ -471,7 +471,8 @@ main (int argc, char *argv[])
                                   NUM_DAEMONS,
                                   0, NULL, NULL,
                                   &do_connect, NULL);
-  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+  GNUNET_DISK_purge_cfg_dir ("perf_gnunet_service_fs_p2p.conf",
+                             "GNUNET_TEST_HOME");
   return ok;
 }
 
diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c
index 7f0077bdd..714dd452e 100644
--- a/src/fs/test_fs_test_lib.c
+++ b/src/fs/test_fs_test_lib.c
@@ -165,13 +165,15 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+  GNUNET_DISK_purge_cfg_dir ("fs_test_lib_data.conf", 
+                             "GNUNET_TEST_HOME");
   (void) GNUNET_TESTBED_test_run ("test_fs_test_lib",
                                   "fs_test_lib_data.conf",
                                   NUM_DAEMONS,
                                   0, NULL, NULL,
                                   &run, NULL);
-  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+  GNUNET_DISK_purge_cfg_dir ("fs_test_lib_data.conf", 
+                             "GNUNET_TEST_HOME");
   return ret;
 }
 
diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c
index aac7b1b97..e0f23097b 100644
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -327,7 +327,10 @@ main (int argc, char *argv[])
     failureCount += testFile (i);
   }
   /* fprintf (stderr, "%s",  "\n"); */
-  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-uri");
+  GNUNET_DISK_purge_cfg_dir 
+    ("test_fs_uri.conf", 
+     "GNUNET_TEST_HOME");
+
   if (failureCount != 0)
     return 1;
   return 0;
diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index d4a1c38b5..38b00f3e8 100644
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -213,7 +213,9 @@ main (int argc,
                                   0, NULL, NULL,
                                   &do_publish,
                                   NULL);
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
+  GNUNET_DISK_purge_cfg_dir 
+    ("test_gnunet_service_fs_migration_data.conf", 
+     "GNUNET_TEST_HOME");
   return ok;
 }
 
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index bedcb7173..2d1fbb788 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -158,7 +158,8 @@ main (int argc, char *argv[])
                                   NUM_DAEMONS,
                                   0, NULL, NULL,
                                   &do_publish, NULL);
-  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+  GNUNET_DISK_purge_cfg_dir (config,
+                             "GNUNET_TEST_HOME");
   return ok;
 }