summaryrefslogtreecommitdiff
path: root/tests/files/system-modules
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2012-07-17 08:08:04 +0200
committerStef Walter <stefw@gnome.org>2012-07-26 12:22:31 +0200
commit542cb48951b7c4c21ca3669d07bf936b0fa58b42 (patch)
tree44bfd4e76bd441d0695a1fbb0099f7d6d5dcafa3 /tests/files/system-modules
parent06595e93ff57e97adbb313aebc50a2e32acd6039 (diff)
Don't rely on loading order for duplicate modules
* We had relied on module 'two' loading before 'two-duplicate' in the conf tests. However this isn't always the case, and the name of the module can end up as 'two-duplicate' https://bugzilla.gnome.org/show_bug.cgi?id=44740
Diffstat (limited to 'tests/files/system-modules')
-rw-r--r--tests/files/system-modules/four.module3
-rw-r--r--tests/files/system-modules/two.badname2
-rw-r--r--tests/files/system-modules/win32/four.module3
3 files changed, 6 insertions, 2 deletions
diff --git a/tests/files/system-modules/four.module b/tests/files/system-modules/four.module
new file mode 100644
index 0000000..6eace3c
--- /dev/null
+++ b/tests/files/system-modules/four.module
@@ -0,0 +1,3 @@
+
+module: mock-four.so
+disable-in: test-disable, test-other
diff --git a/tests/files/system-modules/two.badname b/tests/files/system-modules/two.badname
index b6d0f7f..0d41cac 100644
--- a/tests/files/system-modules/two.badname
+++ b/tests/files/system-modules/two.badname
@@ -3,5 +3,3 @@
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/win32/four.module b/tests/files/system-modules/win32/four.module
new file mode 100644
index 0000000..7fd1540
--- /dev/null
+++ b/tests/files/system-modules/win32/four.module
@@ -0,0 +1,3 @@
+
+module: mock-four.dll
+disable-in: test-disable, test-other