Merge 'master' into noverlay

6 files changed, 29 insertions, 0 deletions

diff --git a/test/lisp/xdg-resources/l10n.desktop b/test/lisp/xdg-resources/l10n.desktop
new file mode 100644
index 00000000000..42da83910da
--- /dev/null
+++ b/test/lisp/xdg-resources/l10n.desktop
@@ -0,0 +1,5 @@
+# localized strings
+[Desktop Entry]
+Comment=Cheers
+Comment[en_US@piglatin]=Eerschay
+Comment[sv]=Skål
diff --git a/test/lisp/xdg-resources/malformed.desktop b/test/lisp/xdg-resources/malformed.desktop
new file mode 100644
index 00000000000..144a3f719d5
--- /dev/null
+++ b/test/lisp/xdg-resources/malformed.desktop
@@ -0,0 +1,4 @@
+# unacceptable key=value format
+[Desktop Entry]
+Key=value
+aowef faoweif of
diff --git a/test/lisp/xdg-resources/mimeapps.list b/test/lisp/xdg-resources/mimeapps.list
new file mode 100644
index 00000000000..27fbd94b16b
--- /dev/null
+++ b/test/lisp/xdg-resources/mimeapps.list
@@ -0,0 +1,9 @@
+[Default Applications]
+x-test/foo=a.desktop
+
+[Added Associations]
+x-test/foo=b.desktop
+x-test/baz=a.desktop
+
+[Removed Associations]
+x-test/foo=c.desktop;d.desktop
diff --git a/test/lisp/xdg-resources/mimeinfo.cache b/test/lisp/xdg-resources/mimeinfo.cache
new file mode 100644
index 00000000000..6e54f604fa0
--- /dev/null
+++ b/test/lisp/xdg-resources/mimeinfo.cache
@@ -0,0 +1,4 @@
+[MIME Cache]
+x-test/foo=c.desktop;d.desktop
+x-test/bar=a.desktop;c.desktop
+x-test/baz=b.desktop;d.desktop
diff --git a/test/lisp/xdg-resources/test.desktop b/test/lisp/xdg-resources/test.desktop
new file mode 100644
index 00000000000..b848cef5b0f
--- /dev/null
+++ b/test/lisp/xdg-resources/test.desktop
@@ -0,0 +1,5 @@
+# this is a comment
+[Desktop Entry]
+Name=Test
+[Another Section]
+Exec=frobnicate
diff --git a/test/lisp/xdg-resources/wrong.desktop b/test/lisp/xdg-resources/wrong.desktop
new file mode 100644
index 00000000000..e0b4c221cf9
--- /dev/null
+++ b/test/lisp/xdg-resources/wrong.desktop
@@ -0,0 +1,2 @@
+# the first section must be "Desktop Entry"
+[Why]