From a63311a0f3f2669138d09ff8f618fd4d12fa0c3d Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Wed, 3 Apr 2013 10:50:59 +0200 Subject: More compatible path munging and handling code Centralize the path handling code, so we can remove unixy assumptions and have a chance of running on Windows. The current goal is to run all the tests on Windows. Includes some code from LRN https://bugs.freedesktop.org/show_bug.cgi?id=63062 --- tools/tests/test-openssl.c | 3 ++- tools/tests/test-pem.c | 3 ++- tools/tests/test-save.c | 3 ++- tools/tests/test-x509.c | 3 ++- tools/tool.c | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/tests/test-openssl.c b/tools/tests/test-openssl.c index 286b4e9..215e0da 100644 --- a/tools/tests/test-openssl.c +++ b/tools/tests/test-openssl.c @@ -43,6 +43,7 @@ #include "extract.h" #include "message.h" #include "mock.h" +#include "path.h" #include "pkcs11.h" #include "pkcs11x.h" #include "oid.h" @@ -78,7 +79,7 @@ setup (CuTest *tc) p11_extract_info_init (&test.ex); - test.directory = strdup ("/tmp/test-extract.XXXXXX"); + test.directory = p11_path_expand ("$TEMP/test-extract.XXXXXX"); if (!mkdtemp (test.directory)) assert_not_reached (); } diff --git a/tools/tests/test-pem.c b/tools/tests/test-pem.c index be79279..dc1cb08 100644 --- a/tools/tests/test-pem.c +++ b/tools/tests/test-pem.c @@ -42,6 +42,7 @@ #include "extract.h" #include "message.h" #include "mock.h" +#include "path.h" #include "pkcs11.h" #include "pkcs11x.h" #include "oid.h" @@ -75,7 +76,7 @@ setup (CuTest *tc) p11_extract_info_init (&test.ex); - test.directory = strdup ("/tmp/test-extract.XXXXXX"); + test.directory = p11_path_expand ("$TEMP/test-extract.XXXXXX"); if (!mkdtemp (test.directory)) assert_not_reached (); } diff --git a/tools/tests/test-save.c b/tools/tests/test-save.c index d686bd6..b739c21 100644 --- a/tools/tests/test-save.c +++ b/tools/tests/test-save.c @@ -40,6 +40,7 @@ #include "debug.h" #include "dict.h" #include "message.h" +#include "path.h" #include "save.h" #include "test.h" @@ -62,7 +63,7 @@ struct { static void setup (CuTest *tc) { - test.directory = strdup ("/tmp/test-extract.XXXXXX"); + test.directory = p11_path_expand ("$TEMP/test-extract.XXXXXX"); if (!mkdtemp (test.directory)) CuFail (tc, "mkdtemp() failed"); } diff --git a/tools/tests/test-x509.c b/tools/tests/test-x509.c index 138e6b7..e952e53 100644 --- a/tools/tests/test-x509.c +++ b/tools/tests/test-x509.c @@ -42,6 +42,7 @@ #include "extract.h" #include "message.h" #include "mock.h" +#include "path.h" #include "pkcs11.h" #include "pkcs11x.h" #include "oid.h" @@ -75,7 +76,7 @@ setup (CuTest *tc) p11_extract_info_init (&test.ex); - test.directory = strdup ("/tmp/test-extract.XXXXXX"); + test.directory = p11_path_expand ("$TEMP/test-extract.XXXXXX"); if (!mkdtemp (test.directory)) CuFail (tc, "mkdtemp() failed"); } diff --git a/tools/tool.c b/tools/tool.c index 9ec41a4..961890d 100644 --- a/tools/tool.c +++ b/tools/tool.c @@ -38,6 +38,7 @@ #include "compat.h" #include "debug.h" #include "message.h" +#include "path.h" #include "p11-kit.h" #include @@ -201,7 +202,7 @@ exec_external (const char *command, /* Add our libexec directory to the path */ path = getenv ("PATH"); - if (!asprintf (&env, "PATH=%s%s%s", path ? path : "", path ? ":" : "", PKGDATADIR)) + if (!asprintf (&env, "PATH=%s%s%s", path ? path : "", path ? P11_PATH_SEP : "", PKGDATADIR)) return_if_reached (); putenv (env); -- cgit v1.1