diff options
| author | Stef Walter <stefw@gnome.org> | 2013-01-29 12:53:29 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2013-02-05 09:42:34 +0100 |
| commit | 85751aa21dd9b93d8eb51e36767b5564ce6ce005 (patch) | |
| tree | b84960ea526b426fc002643d5eb48809289853f4 /p11-kit/tests | |
| parent | a9790a21302f47016a88ba9a2c904bed11efb388 (diff) | |
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
Diffstat (limited to 'p11-kit/tests')
| -rw-r--r-- | p11-kit/tests/conf-test.c | 4 | ||||
| -rw-r--r-- | p11-kit/tests/files/package-modules/four.module (renamed from p11-kit/tests/files/system-modules/four.module) | 0 | ||||
| -rw-r--r-- | p11-kit/tests/files/package-modules/win32/four.module (renamed from p11-kit/tests/files/system-modules/win32/four.module) | 0 |
3 files changed, 4 insertions, 0 deletions
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/system-modules/four.module b/p11-kit/tests/files/package-modules/four.module index 6eace3c..6eace3c 100644 --- a/p11-kit/tests/files/system-modules/four.module +++ b/p11-kit/tests/files/package-modules/four.module diff --git a/p11-kit/tests/files/system-modules/win32/four.module b/p11-kit/tests/files/package-modules/win32/four.module index 7fd1540..7fd1540 100644 --- a/p11-kit/tests/files/system-modules/win32/four.module +++ b/p11-kit/tests/files/package-modules/win32/four.module |