diff options
| author | Stef Walter <stefw@gnome.org> | 2012-07-17 08:05:18 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-07-26 12:22:31 +0200 |
| commit | 356377709cd1de1308d9d8cf15f528578a360cf3 (patch) | |
| tree | 6266878e283f1eeaf582dbe14818853793fb120f /tests | |
| parent | f10d361a5b523ce7f9289ba8d45ccd847510d619 (diff) | |
Use correct shared library extension on windows
* The windows shared libraries have the .dll extension
* This means we also need separate directories for the test module
configs on win32
https://bugzilla.gnome.org/show_bug.cgi?id=44740
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/files/system-modules/win32/one.module | 3 | ||||
| -rw-r--r-- | tests/files/system-modules/win32/two-duplicate.module | 3 | ||||
| -rw-r--r-- | tests/files/system-modules/win32/two.badname | 5 | ||||
| -rw-r--r-- | tests/files/user-modules/win32/one.module | 2 | ||||
| -rw-r--r-- | tests/files/user-modules/win32/three.module | 5 | ||||
| -rw-r--r-- | tests/test-init.c | 2 |
6 files changed, 19 insertions, 1 deletions
diff --git a/tests/files/system-modules/win32/one.module b/tests/files/system-modules/win32/one.module new file mode 100644 index 0000000..5f80304 --- /dev/null +++ b/tests/files/system-modules/win32/one.module @@ -0,0 +1,3 @@ + +module: mock-one.dll +setting: system1
\ No newline at end of file diff --git a/tests/files/system-modules/win32/two-duplicate.module b/tests/files/system-modules/win32/two-duplicate.module new file mode 100644 index 0000000..e80c9e8 --- /dev/null +++ b/tests/files/system-modules/win32/two-duplicate.module @@ -0,0 +1,3 @@ + +# This is a duplicate of the 'two' module +module: mock-two.dll diff --git a/tests/files/system-modules/win32/two.badname b/tests/files/system-modules/win32/two.badname new file mode 100644 index 0000000..ae44b83 --- /dev/null +++ b/tests/files/system-modules/win32/two.badname @@ -0,0 +1,5 @@ +# This module doesn't have a .module extension, but p11-kit doesn't yet +# enforce the naming, just warns, so it should still be loaded + +module: mock-two.dll +setting: system2 diff --git a/tests/files/user-modules/win32/one.module b/tests/files/user-modules/win32/one.module new file mode 100644 index 0000000..c371e4a --- /dev/null +++ b/tests/files/user-modules/win32/one.module @@ -0,0 +1,2 @@ + +setting: user1
\ No newline at end of file diff --git a/tests/files/user-modules/win32/three.module b/tests/files/user-modules/win32/three.module new file mode 100644 index 0000000..58f883d --- /dev/null +++ b/tests/files/user-modules/win32/three.module @@ -0,0 +1,5 @@ + +module: mock-three.dll +setting: user3 + +enable-in: test-enable
\ No newline at end of file diff --git a/tests/test-init.c b/tests/test-init.c index 8128db6..d872afa 100644 --- a/tests/test-init.c +++ b/tests/test-init.c @@ -273,7 +273,7 @@ test_load_and_initialize (CuTest *tc) CK_RV rv; int ret; - rv = p11_kit_load_initialize_module (BUILDDIR "/.libs/mock-one.so", &module); + rv = p11_kit_load_initialize_module (BUILDDIR "/.libs/mock-one" SHLEXT, &module); CuAssertTrue (tc, rv == CKR_OK); CuAssertTrue (tc, module != NULL); |