diff options
| author | Stef Walter <stefw@gnome.org> | 2012-07-16 17:56:24 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-07-24 06:54:59 +0200 |
| commit | f10d361a5b523ce7f9289ba8d45ccd847510d619 (patch) | |
| tree | d14ad400bb3d86a591effb749271b209b5a714e8 /tests/files/system-modules | |
| parent | c0251b132cad98318be0565f676b9fa92dd1b8b4 (diff) | |
Use '.module' extension on module configs
* And want alphanumeric/_.- filenames
* Currently this is just a warning, soon it will be enforced
* The name of a module does not include the extension
Andreas Metzler and Ubuntu both worked on this patch, and I've made
some more changes.
See https://bugs.launchpad.net/ubuntu/+source/p11-kit/+bug/911436
https://bugs.freedesktop.org/show_bug.cgi?id=52158
Diffstat (limited to 'tests/files/system-modules')
| -rw-r--r-- | tests/files/system-modules/one.module (renamed from tests/files/system-modules/one) | 0 | ||||
| -rw-r--r-- | tests/files/system-modules/two | 5 | ||||
| -rw-r--r-- | tests/files/system-modules/two-duplicate.module (renamed from tests/files/system-modules/two-duplicate) | 0 | ||||
| -rw-r--r-- | tests/files/system-modules/two.badname | 7 |
4 files changed, 7 insertions, 5 deletions
diff --git a/tests/files/system-modules/one b/tests/files/system-modules/one.module index 3620869..3620869 100644 --- a/tests/files/system-modules/one +++ b/tests/files/system-modules/one.module diff --git a/tests/files/system-modules/two b/tests/files/system-modules/two deleted file mode 100644 index f391757..0000000 --- a/tests/files/system-modules/two +++ /dev/null @@ -1,5 +0,0 @@ - -module: mock-two.so -setting: system2 - -disable-in: test-disable, test-other
\ No newline at end of file diff --git a/tests/files/system-modules/two-duplicate b/tests/files/system-modules/two-duplicate.module index 907aa75..907aa75 100644 --- a/tests/files/system-modules/two-duplicate +++ b/tests/files/system-modules/two-duplicate.module diff --git a/tests/files/system-modules/two.badname b/tests/files/system-modules/two.badname new file mode 100644 index 0000000..b6d0f7f --- /dev/null +++ b/tests/files/system-modules/two.badname @@ -0,0 +1,7 @@ +# 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.so +setting: system2 + +disable-in: test-disable, test-other
\ No newline at end of file |