From 966ceb6893b6ad0a504d7435ec97fc4beba65bb2 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 7 Sep 2009 12:04:15 +0000
Subject: better clean up

---
 src/core/test_core_api.c                      | 2 ++
 src/datastore/test_datastore_api.c            | 1 +
 src/peerinfo/test_peerinfo_api.c              | 2 +-
 src/transport/test_plugin_transport.c         | 5 ++++-
 src/transport/test_plugin_transport_data.conf | 2 +-
 src/transport/test_transport_api.c            | 3 ++-
 src/util/test_pseudonym.c                     | 1 +
 7 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index 935c004cc..753d2cc3a 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -384,6 +384,8 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-core-peer-1"); 
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-core-peer-2");
 
   return ret;
 }
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 3a9f8a235..e8e303436 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -598,6 +598,7 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-datastore");
 
   return ret;
 }
diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index b91241979..2bae851bc 100644
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -169,7 +169,7 @@ main (int argc, char *argv[])
   int ret = 0;
 
   ret = check ();
-
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-peerinfo");
   return ret;
 }
 
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 981ce142a..550885007 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -341,6 +341,7 @@ main (int argc, char *const *argv)
   static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
+  int ret;
   char *const argv_prog[] = {
     "test_plugin_transport",
     "-c",
@@ -361,13 +362,15 @@ main (int argc, char *const *argv)
 #endif
                     NULL);       
   ok = 1; /* set to fail */
-  return (GNUNET_OK ==
+  ret = (GNUNET_OK ==
           GNUNET_PROGRAM_run (5,
                               argv_prog,
                               "test-plugin-transport",
 			      "testcase",
 			      options,
                               &run, NULL)) ? ok : 1;
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
+  return ret;
 }
 
 /* end of test_plugin_transport.c */
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index fe05589d9..05e41d612 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-plugin-transport/
+SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
 
 [resolver]
 PORT = 2364
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index ae4ba3c76..f98bce573 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -294,7 +294,8 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1"); 
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
   return ret;
 }
 
diff --git a/src/util/test_pseudonym.c b/src/util/test_pseudonym.c
index dd6cf680d..d358c8210 100644
--- a/src/util/test_pseudonym.c
+++ b/src/util/test_pseudonym.c
@@ -132,6 +132,7 @@ FAILURE:
   GNUNET_PSEUDONYM_discovery_callback_unregister (&noti_callback, &notiCount);
   GNUNET_CONTAINER_meta_data_destroy (meta);
   GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test");
   return (ok == GNUNET_YES) ? 0 : 1;
 }
 
-- 
cgit v1.2.3