summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore12
-rw-r--r--common/Makefile.am12
-rw-r--r--common/test-compat.c4
-rw-r--r--p11-kit/Makefile.am32
-rw-r--r--p11-kit/test-conf.c2
-rwxr-xr-xp11-kit/test-messages.sh2
-rw-r--r--p11-kit/test-server.c4
-rwxr-xr-xp11-kit/test-server.sh4
-rw-r--r--p11-kit/test-transport.c6
9 files changed, 39 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore
index 4e3f7e6..f9f58b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,7 +57,7 @@ local
x86_64-w64-mingw32
/test-*
-/frob-*
+frob-*
/x86_64_w64-mingw32/
@@ -101,11 +101,11 @@ x86_64-w64-mingw32
/p11-kit/virtual-fixed-generated.h
/p11-kit/*.gnu.c
-/p11-kit-remote
-/p11-kit-server
-/p11-kit-remote-testable
-/p11-kit-server-testable
-/print-messages
+/p11-kit/p11-kit-remote
+/p11-kit/p11-kit-server
+/p11-kit/p11-kit-remote-testable
+/p11-kit/p11-kit-server-testable
+/p11-kit/print-messages
/po/POTFILES
/po/stamp-po
diff --git a/common/Makefile.am b/common/Makefile.am
index 410d704..4c6e24c 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -119,12 +119,12 @@ test_runtime_SOURCES = common/test-runtime.c
test_runtime_LDADD = $(common_LIBS)
check_PROGRAMS += \
- frob-getauxval \
- frob-getenv \
+ common/frob-getauxval \
+ common/frob-getenv \
$(NULL)
-frob_getauxval_SOURCES = common/frob-getauxval.c
-frob_getauxval_LDADD = $(common_LIBS)
+common_frob_getauxval_SOURCES = common/frob-getauxval.c
+common_frob_getauxval_LDADD = $(common_LIBS)
-frob_getenv_SOURCES = common/frob-getenv.c
-frob_getenv_LDADD = $(common_LIBS)
+common_frob_getenv_SOURCES = common/frob-getenv.c
+common_frob_getenv_LDADD = $(common_LIBS)
diff --git a/common/test-compat.c b/common/test-compat.c
index e1deac8..4e76a7d 100644
--- a/common/test-compat.c
+++ b/common/test-compat.c
@@ -63,7 +63,7 @@ static void
test_getauxval (void)
{
/* 23 is AT_SECURE */
- const char *args[] = { BUILDDIR "/frob-getauxval", "23", NULL };
+ const char *args[] = { BUILDDIR "/common/frob-getauxval", "23", NULL };
char *path;
int ret;
@@ -86,7 +86,7 @@ test_getauxval (void)
static void
test_secure_getenv (void)
{
- const char *args[] = { BUILDDIR "/frob-getenv", "BLAH", NULL };
+ const char *args[] = { BUILDDIR "/common/frob-getenv", "BLAH", NULL };
char *path;
int ret;
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 7f4ce44..b649119 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -232,57 +232,57 @@ p11_kit_p11_kit_LDADD = \
$(LTLIBINTL) \
$(NULL)
-private_PROGRAMS += p11-kit-remote
+private_PROGRAMS += p11-kit/p11-kit-remote
-p11_kit_remote_SOURCES = \
+p11_kit_p11_kit_remote_SOURCES = \
p11-kit/remote.c \
$(NULL)
-p11_kit_remote_LDADD = \
+p11_kit_p11_kit_remote_LDADD = \
libp11-tool.la \
libp11-common.la \
libp11-kit.la \
$(NULL)
-check_PROGRAMS += p11-kit-remote-testable
-p11_kit_remote_testable_SOURCES = $(p11_kit_remote_SOURCES)
+check_PROGRAMS += p11-kit/p11-kit-remote-testable
+p11_kit_p11_kit_remote_testable_SOURCES = $(p11_kit_p11_kit_remote_SOURCES)
-p11_kit_remote_testable_LDADD = \
+p11_kit_p11_kit_remote_testable_LDADD = \
libp11-tool.la \
libp11-common.la \
libp11-kit-testable.la \
$(NULL)
-private_PROGRAMS += p11-kit-server
+private_PROGRAMS += p11-kit/p11-kit-server
-p11_kit_server_SOURCES = \
+p11_kit_p11_kit_server_SOURCES = \
p11-kit/server.c \
$(NULL)
-p11_kit_server_LDADD = \
+p11_kit_p11_kit_server_LDADD = \
libp11-tool.la \
libp11-common.la \
libp11-kit.la \
$(LIBSYSTEMD_LIBS) \
$(NULL)
-p11_kit_server_CFLAGS = \
+p11_kit_p11_kit_server_CFLAGS = \
-DP11_KIT_REMOTE=\"p11-kit-remote\" \
$(COMMON_CFLAGS) \
$(LIBSYSTEMD_CFLAGS) \
$(NULL)
-check_PROGRAMS += p11-kit-server-testable
-p11_kit_server_testable_SOURCES = $(p11_kit_server_SOURCES)
+check_PROGRAMS += p11-kit/p11-kit-server-testable
+p11_kit_p11_kit_server_testable_SOURCES = $(p11_kit_p11_kit_server_SOURCES)
-p11_kit_server_testable_LDADD = \
+p11_kit_p11_kit_server_testable_LDADD = \
libp11-tool.la \
libp11-common.la \
libp11-kit-testable.la \
$(LIBSYSTEMD_LIBS) \
$(NULL)
-p11_kit_server_testable_CFLAGS = \
+p11_kit_p11_kit_server_testable_CFLAGS = \
-DP11_KIT_REMOTE=\"p11-kit-remote-testable\" \
$(COMMON_CFLAGS) \
$(LIBSYSTEMD_CFLAGS) \
@@ -368,8 +368,8 @@ test_util_SOURCES = p11-kit/test-util.c
test_util_LDADD = $(p11_kit_LIBS)
check_PROGRAMS += \
- print-messages \
- frob-setuid
+ p11-kit/print-messages \
+ p11-kit/frob-setuid
print_messages_SOURCES = p11-kit/print-messages.c
print_messages_LDADD = $(p11_kit_LIBS)
diff --git a/p11-kit/test-conf.c b/p11-kit/test-conf.c
index f4ef0f6..098be0f 100644
--- a/p11-kit/test-conf.c
+++ b/p11-kit/test-conf.c
@@ -402,7 +402,7 @@ test_parse_boolean (void)
static void
test_setuid (void)
{
- const char *args[] = { BUILDDIR "/frob-setuid", NULL, };
+ const char *args[] = { BUILDDIR "/p11-kit/frob-setuid", NULL, };
char *path;
int ret;
diff --git a/p11-kit/test-messages.sh b/p11-kit/test-messages.sh
index 59dded4..7283e77 100755
--- a/p11-kit/test-messages.sh
+++ b/p11-kit/test-messages.sh
@@ -96,7 +96,7 @@ CKR_MUTEX_NOT_LOCKED: The data cannot be locked
CKR_FUNCTION_REJECTED: The request was rejected by the user
EOF
-${WINE} "$abs_top_builddir"/print-messages | tr -d '\r' > messages.out
+${WINE} "$abs_top_builddir"/p11-kit/print-messages | tr -d '\r' > messages.out
echo 1..1
diff --git a/p11-kit/test-server.c b/p11-kit/test-server.c
index d6ab5d5..76b9d4e 100644
--- a/p11-kit/test-server.c
+++ b/p11-kit/test-server.c
@@ -105,7 +105,7 @@ setup_server (void *arg)
ret = socketpair (AF_UNIX, SOCK_STREAM, 0, fds);
assert_num_cmp (-1, !=, ret);
- setenv ("P11_KIT_PRIVATEDIR", BUILDDIR, 1);
+ setenv ("P11_KIT_PRIVATEDIR", BUILDDIR "/p11-kit", 1);
/* Allow the child process to preload libasan.so */
envvar = secure_getenv ("P11_KIT_TEST_LD_PRELOAD");
@@ -129,7 +129,7 @@ setup_server (void *arg)
close (STDOUT_FILENO);
if (dup2 (fds[0], STDOUT_FILENO) == -1)
assert_not_reached ();
- if (execv (BUILDDIR "/p11-kit-server-testable", (char **)args->elem) == -1)
+ if (execv (BUILDDIR "/p11-kit/p11-kit-server-testable", (char **)args->elem) == -1)
assert_not_reached ();
p11_array_free (args);
_exit (0);
diff --git a/p11-kit/test-server.sh b/p11-kit/test-server.sh
index e1d27ac..74b9491 100755
--- a/p11-kit/test-server.sh
+++ b/p11-kit/test-server.sh
@@ -23,7 +23,7 @@ export XDG_RUNTIME_DIR
echo 1..4
-"$abs_top_builddir"/p11-kit-server -s --provider "$abs_top_builddir"/.libs/mock-one.so pkcs11: > start.env 2> start.err
+"$abs_top_builddir"/p11-kit/p11-kit-server -s --provider "$abs_top_builddir"/.libs/mock-one.so pkcs11: > start.env 2> start.err
if test $? -eq 0; then
echo "ok 1 /server/start"
else
@@ -41,7 +41,7 @@ else
exit 1
fi
-"$abs_top_builddir"/p11-kit-server -s -k > stop.env 2> stop.err
+"$abs_top_builddir"/p11-kit/p11-kit-server -s -k > stop.env 2> stop.err
if test $? -eq 0; then
echo "ok 3 /server/stop"
else
diff --git a/p11-kit/test-transport.c b/p11-kit/test-transport.c
index 40e5903..a5a93ea 100644
--- a/p11-kit/test-transport.c
+++ b/p11-kit/test-transport.c
@@ -82,7 +82,7 @@ setup_remote (void *unused)
test.user_config = p11_path_build (test.directory, "pkcs11.conf", NULL);
p11_test_file_write (NULL, test.user_config, data, strlen (data));
- setenv ("P11_KIT_PRIVATEDIR", BUILDDIR, 1);
+ setenv ("P11_KIT_PRIVATEDIR", BUILDDIR "/p11-kit", 1);
data = "remote: |" BUILDDIR "/p11-kit/p11-kit" EXEEXT " remote " BUILDDIR "/.libs/mock-two" SHLEXT "\n";
p11_test_file_write (test.user_modules, "remote.module", data, strlen (data));
data = "remote: |" BUILDDIR "/p11-kit/p11-kit" EXEEXT " remote " BUILDDIR "/.libs/mock-five" SHLEXT "\nx-init-reserved: initialize-arg";
@@ -195,7 +195,7 @@ launch_server (void)
argv[1] = BUILDDIR "/.libs/mock-two.so";
argv[2] = NULL;
- rc = execv (BUILDDIR "/p11-kit-remote", argv);
+ rc = execv (BUILDDIR "/p11-kit/p11-kit-remote", argv);
assert_num_cmp (rc, !=, -1);
}
@@ -228,7 +228,7 @@ setup_remote_unix (void *unused)
test.pid = pid;
}
- setenv ("P11_KIT_PRIVATEDIR", BUILDDIR, 1);
+ setenv ("P11_KIT_PRIVATEDIR", BUILDDIR "/p11-kit", 1);
if (asprintf (&path, "%s/pkcs11", test.directory) < 0)
assert_not_reached ();
generated by cgit v1.1 at 2025-01-17 02:29:40 +0000