aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-11-01 14:25:31 +0000
committerJussi Pakkanen <jpakkane@gmail.com>2018-11-04 21:26:15 +0200
commita562b08ae1f3d36a45a83f6690cadf594e285d65 (patch)
tree4ce9756edde835b440259a08097dd1bcc01f8939
parent42cdb32033fb79f6ce551626ca269f2cd7d09fd2 (diff)
downloadmeson-a562b08ae1f3d36a45a83f6690cadf594e285d65.zip
meson-a562b08ae1f3d36a45a83f6690cadf594e285d65.tar.gz
meson-a562b08ae1f3d36a45a83f6690cadf594e285d65.tar.bz2
Install files from the test added in 2ff69b20 to make sure it runs
and make the test runnable :)
-rw-r--r--test cases/frameworks/6 gettext/generated/desktopgenerator.py6
-rw-r--r--test cases/frameworks/6 gettext/generated/meson.build2
-rw-r--r--test cases/frameworks/6 gettext/installed_files.txt1
3 files changed, 8 insertions, 1 deletions
diff --git a/test cases/frameworks/6 gettext/generated/desktopgenerator.py b/test cases/frameworks/6 gettext/generated/desktopgenerator.py
index 6ff799d..e49c2d6 100644
--- a/test cases/frameworks/6 gettext/generated/desktopgenerator.py
+++ b/test cases/frameworks/6 gettext/generated/desktopgenerator.py
@@ -5,5 +5,9 @@ import os, sys, shutil
ifile = sys.argv[1]
ofile = sys.argv[2]
-os.unlink(ofile)
+try:
+ os.unlink(ofile)
+except FileNotFoundError:
+ pass
+
shutil.copy(ifile, ofile)
diff --git a/test cases/frameworks/6 gettext/generated/meson.build b/test cases/frameworks/6 gettext/generated/meson.build
index 02e61ba..5ed9205 100644
--- a/test cases/frameworks/6 gettext/generated/meson.build
+++ b/test cases/frameworks/6 gettext/generated/meson.build
@@ -11,4 +11,6 @@ i18n.merge_file(
output : 'something.desktop',
type : 'desktop',
po_dir : '../po',
+ install: true,
+ install_dir: join_paths(get_option('datadir'), 'applications'),
)
diff --git a/test cases/frameworks/6 gettext/installed_files.txt b/test cases/frameworks/6 gettext/installed_files.txt
index 868f4c1..850711a 100644
--- a/test cases/frameworks/6 gettext/installed_files.txt
+++ b/test cases/frameworks/6 gettext/installed_files.txt
@@ -1,6 +1,7 @@
usr/bin/intlprog?exe
usr/share/locale/de/LC_MESSAGES/intltest.mo
usr/share/locale/fi/LC_MESSAGES/intltest.mo
+usr/share/applications/something.desktop
usr/share/applications/test.desktop
usr/share/applications/test2.desktop
usr/share/applications/test3.desktop