test: Improve temporary directory handling

diff --git a/p11-kit/test-transport.c b/p11-kit/test-transport.c
index c128e54a1ecb61b72f26a8232f4d4a879ec92744..40e5903ae32da08d2c463d314f700f2ffc5fe0ca 100644 (file)
--- a/p11-kit/test-transport.c
+++ b/p11-kit/test-transport.c
@@ -69,7 +69,7 @@ setup_remote (void *unused)
 {
        const char *data;
 
-       test.directory = p11_test_directory ("p11-test-config");
+       test.directory = p11_test_directory ("p11-test-transport");
        test.user_modules = p11_path_build (test.directory, "modules", NULL);
 #ifdef OS_UNIX
        if (mkdir (test.user_modules, 0700) < 0)
@@ -206,7 +206,7 @@ setup_remote_unix (void *unused)
        char *path;
        pid_t pid;
 
-       test.directory = p11_test_directory ("p11-test-config");
+       test.directory = p11_test_directory ("p11-test-transport");
        test.user_modules = p11_path_build (test.directory, "modules", NULL);
        if (mkdir (test.user_modules, 0700) < 0)
                assert_not_reached ();
@@ -251,6 +251,8 @@ static void
 teardown_remote_unix (void *unused)
 {
        kill (test.pid, SIGKILL);
+       p11_test_directory_delete (test.directory);
+       free (test.directory);
 }
 
 #endif /* OS_UNIX */

diff --git a/trust/test-module.c b/trust/test-module.c
index e05ea227589a2241a5b1555c1b885c91561dc823..1e8d812c49fc4908214d17cc44b0e092ac36f753 100644 (file)
--- a/trust/test-module.c
+++ b/trust/test-module.c
@@ -119,6 +119,8 @@ teardown (void *unused)
        rv = test.module->C_Finalize (NULL);
        assert (rv == CKR_OK);
 
+       if (test.directory)
+               p11_test_directory_delete (test.directory);
        free (test.directory);
 
        memset (&test, 0, sizeof (test));