summaryrefslogtreecommitdiff
path: root/tests/files
diff options
context:
space:
mode:
Diffstat (limited to 'tests/files')
-rw-r--r--tests/files/system-modules/two4
-rw-r--r--tests/files/system-pkcs11.conf3
-rw-r--r--tests/files/user-modules/three4
3 files changed, 9 insertions, 2 deletions
diff --git a/tests/files/system-modules/two b/tests/files/system-modules/two
index 0bfa3ca..f391757 100644
--- a/tests/files/system-modules/two
+++ b/tests/files/system-modules/two
@@ -1,3 +1,5 @@
module: mock-two.so
-setting: system2 \ No newline at end of file
+setting: system2
+
+disable-in: test-disable, test-other \ No newline at end of file
diff --git a/tests/files/system-pkcs11.conf b/tests/files/system-pkcs11.conf
new file mode 100644
index 0000000..20741e7
--- /dev/null
+++ b/tests/files/system-pkcs11.conf
@@ -0,0 +1,3 @@
+
+# Merge in user config
+user-config: merge \ No newline at end of file
diff --git a/tests/files/user-modules/three b/tests/files/user-modules/three
index 70c5e03..00caab5 100644
--- a/tests/files/user-modules/three
+++ b/tests/files/user-modules/three
@@ -1,3 +1,5 @@
module: mock-three.so
-setting: user3 \ No newline at end of file
+setting: user3
+
+enable-in: test-enable \ No newline at end of file