diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-09-07 12:04:15 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-09-07 12:04:15 +0000 |
commit | 966ceb6893b6ad0a504d7435ec97fc4beba65bb2 (patch) | |
tree | 27e4c9440ff0db256c21a8d71158ea4d1ae13f22 /src | |
parent | 9dac7b6b7b035d55bdb9731795712ead92e11f76 (diff) | |
download | gnunet-966ceb6893b6ad0a504d7435ec97fc4beba65bb2.tar.gz gnunet-966ceb6893b6ad0a504d7435ec97fc4beba65bb2.zip |
better clean up
Diffstat (limited to 'src')
-rw-r--r-- | src/core/test_core_api.c | 2 | ||||
-rw-r--r-- | src/datastore/test_datastore_api.c | 1 | ||||
-rw-r--r-- | src/peerinfo/test_peerinfo_api.c | 2 | ||||
-rw-r--r-- | src/transport/test_plugin_transport.c | 5 | ||||
-rw-r--r-- | src/transport/test_plugin_transport_data.conf | 2 | ||||
-rw-r--r-- | src/transport/test_transport_api.c | 3 | ||||
-rw-r--r-- | src/util/test_pseudonym.c | 1 |
7 files changed, 12 insertions, 4 deletions
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[]) | |||
384 | #endif | 384 | #endif |
385 | NULL); | 385 | NULL); |
386 | ret = check (); | 386 | ret = check (); |
387 | GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-core-peer-1"); | ||
388 | GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-core-peer-2"); | ||
387 | 389 | ||
388 | return ret; | 390 | return ret; |
389 | } | 391 | } |
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[]) | |||
598 | #endif | 598 | #endif |
599 | NULL); | 599 | NULL); |
600 | ret = check (); | 600 | ret = check (); |
601 | GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-datastore"); | ||
601 | 602 | ||
602 | return ret; | 603 | return ret; |
603 | } | 604 | } |
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[]) | |||
169 | int ret = 0; | 169 | int ret = 0; |
170 | 170 | ||
171 | ret = check (); | 171 | ret = check (); |
172 | 172 | GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-peerinfo"); | |
173 | return ret; | 173 | return ret; |
174 | } | 174 | } |
175 | 175 | ||
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) | |||
341 | static struct GNUNET_GETOPT_CommandLineOption options[] = { | 341 | static struct GNUNET_GETOPT_CommandLineOption options[] = { |
342 | GNUNET_GETOPT_OPTION_END | 342 | GNUNET_GETOPT_OPTION_END |
343 | }; | 343 | }; |
344 | int ret; | ||
344 | char *const argv_prog[] = { | 345 | char *const argv_prog[] = { |
345 | "test_plugin_transport", | 346 | "test_plugin_transport", |
346 | "-c", | 347 | "-c", |
@@ -361,13 +362,15 @@ main (int argc, char *const *argv) | |||
361 | #endif | 362 | #endif |
362 | NULL); | 363 | NULL); |
363 | ok = 1; /* set to fail */ | 364 | ok = 1; /* set to fail */ |
364 | return (GNUNET_OK == | 365 | ret = (GNUNET_OK == |
365 | GNUNET_PROGRAM_run (5, | 366 | GNUNET_PROGRAM_run (5, |
366 | argv_prog, | 367 | argv_prog, |
367 | "test-plugin-transport", | 368 | "test-plugin-transport", |
368 | "testcase", | 369 | "testcase", |
369 | options, | 370 | options, |
370 | &run, NULL)) ? ok : 1; | 371 | &run, NULL)) ? ok : 1; |
372 | GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport"); | ||
373 | return ret; | ||
371 | } | 374 | } |
372 | 375 | ||
373 | /* end of test_plugin_transport.c */ | 376 | /* 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 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-plugin-transport/ | 2 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ |
3 | 3 | ||
4 | [resolver] | 4 | [resolver] |
5 | PORT = 2364 | 5 | 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[]) | |||
294 | #endif | 294 | #endif |
295 | NULL); | 295 | NULL); |
296 | ret = check (); | 296 | ret = check (); |
297 | 297 | GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1"); | |
298 | GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2"); | ||
298 | return ret; | 299 | return ret; |
299 | } | 300 | } |
300 | 301 | ||
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: | |||
132 | GNUNET_PSEUDONYM_discovery_callback_unregister (¬i_callback, ¬iCount); | 132 | GNUNET_PSEUDONYM_discovery_callback_unregister (¬i_callback, ¬iCount); |
133 | GNUNET_CONTAINER_meta_data_destroy (meta); | 133 | GNUNET_CONTAINER_meta_data_destroy (meta); |
134 | GNUNET_CONFIGURATION_destroy (cfg); | 134 | GNUNET_CONFIGURATION_destroy (cfg); |
135 | GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test"); | ||
135 | return (ok == GNUNET_YES) ? 0 : 1; | 136 | return (ok == GNUNET_YES) ? 0 : 1; |
136 | } | 137 | } |
137 | 138 | ||