From 85751aa21dd9b93d8eb51e36767b5564ce6ce005 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 29 Jan 2013 12:53:29 +0100 Subject: Add a /usr/share/p11-kit/modules directory for package module configs * Try to make /etc/pkcs11/modules for administrator use * Override the old pkg-config variables to help packages start using the new location --- p11-kit/tests/conf-test.c | 4 ++++ p11-kit/tests/files/package-modules/four.module | 3 +++ p11-kit/tests/files/package-modules/win32/four.module | 3 +++ p11-kit/tests/files/system-modules/four.module | 3 --- p11-kit/tests/files/system-modules/win32/four.module | 3 --- 5 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 p11-kit/tests/files/package-modules/four.module create mode 100644 p11-kit/tests/files/package-modules/win32/four.module delete mode 100644 p11-kit/tests/files/system-modules/four.module delete mode 100644 p11-kit/tests/files/system-modules/win32/four.module (limited to 'p11-kit/tests') diff --git a/p11-kit/tests/conf-test.c b/p11-kit/tests/conf-test.c index 704313d..eccad29 100644 --- a/p11-kit/tests/conf-test.c +++ b/p11-kit/tests/conf-test.c @@ -263,6 +263,7 @@ test_load_modules_merge (CuTest *tc) p11_message_clear (); configs = _p11_conf_load_modules (CONF_USER_MERGE, + SRCDIR "/files/package-modules", SRCDIR "/files/system-modules", SRCDIR "/files/user-modules"); CuAssertPtrNotNull (tc, configs); @@ -295,6 +296,7 @@ test_load_modules_user_none (CuTest *tc) p11_message_clear (); configs = _p11_conf_load_modules (CONF_USER_NONE, + SRCDIR "/files/package-modules", SRCDIR "/files/system-modules", SRCDIR "/files/user-modules"); CuAssertPtrNotNull (tc, configs); @@ -325,6 +327,7 @@ test_load_modules_user_only (CuTest *tc) p11_message_clear (); configs = _p11_conf_load_modules (CONF_USER_ONLY, + SRCDIR "/files/package-modules", SRCDIR "/files/system-modules", SRCDIR "/files/user-modules"); CuAssertPtrNotNull (tc, configs); @@ -355,6 +358,7 @@ test_load_modules_no_user (CuTest *tc) p11_message_clear (); configs = _p11_conf_load_modules (CONF_USER_MERGE, + SRCDIR "/files/package-modules", SRCDIR "/files/system-modules", SRCDIR "/files/non-existant"); CuAssertPtrNotNull (tc, configs); diff --git a/p11-kit/tests/files/package-modules/four.module b/p11-kit/tests/files/package-modules/four.module new file mode 100644 index 0000000..6eace3c --- /dev/null +++ b/p11-kit/tests/files/package-modules/four.module @@ -0,0 +1,3 @@ + +module: mock-four.so +disable-in: test-disable, test-other diff --git a/p11-kit/tests/files/package-modules/win32/four.module b/p11-kit/tests/files/package-modules/win32/four.module new file mode 100644 index 0000000..7fd1540 --- /dev/null +++ b/p11-kit/tests/files/package-modules/win32/four.module @@ -0,0 +1,3 @@ + +module: mock-four.dll +disable-in: test-disable, test-other diff --git a/p11-kit/tests/files/system-modules/four.module b/p11-kit/tests/files/system-modules/four.module deleted file mode 100644 index 6eace3c..0000000 --- a/p11-kit/tests/files/system-modules/four.module +++ /dev/null @@ -1,3 +0,0 @@ - -module: mock-four.so -disable-in: test-disable, test-other diff --git a/p11-kit/tests/files/system-modules/win32/four.module b/p11-kit/tests/files/system-modules/win32/four.module deleted file mode 100644 index 7fd1540..0000000 --- a/p11-kit/tests/files/system-modules/win32/four.module +++ /dev/null @@ -1,3 +0,0 @@ - -module: mock-four.dll -disable-in: test-disable, test-other -- cgit v1.1