summaryrefslogtreecommitdiff
path: root/test cases/common/12 data
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-11-16 22:03:26 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-11-18 17:37:35 -0500
commita01919976eb08277bad78bb22937601cf5a862e0 (patch)
treee366cba35d5e16664c5e3557fd44eb5f17149b07 /test cases/common/12 data
parent996f4d89f3d60731306a6a72b339eb5c2dbb5020 (diff)
downloadmeson-a01919976eb08277bad78bb22937601cf5a862e0.tar.gz
Always specify installed data with a File object. Closes #858.
Diffstat (limited to 'test cases/common/12 data')
-rw-r--r--test cases/common/12 data/fileobject_datafile.dat1
-rw-r--r--test cases/common/12 data/installed_files.txt1
-rw-r--r--test cases/common/12 data/meson.build1
3 files changed, 3 insertions, 0 deletions
diff --git a/test cases/common/12 data/fileobject_datafile.dat b/test cases/common/12 data/fileobject_datafile.dat
new file mode 100644
index 000000000..872aa5a8f
--- /dev/null
+++ b/test cases/common/12 data/fileobject_datafile.dat
@@ -0,0 +1 @@
+This is a data file that is installed via a File object.
diff --git a/test cases/common/12 data/installed_files.txt b/test cases/common/12 data/installed_files.txt
index 3d4b12c31..8651e3a59 100644
--- a/test cases/common/12 data/installed_files.txt
+++ b/test cases/common/12 data/installed_files.txt
@@ -1,4 +1,5 @@
usr/share/progname/datafile.dat
+usr/share/progname/fileobject_datafile.dat
usr/share/progname/vanishing.dat
usr/share/progname/vanishing2.dat
etc/etcfile.dat
diff --git a/test cases/common/12 data/meson.build b/test cases/common/12 data/meson.build
index 80f38354c..7494abcb4 100644
--- a/test cases/common/12 data/meson.build
+++ b/test cases/common/12 data/meson.build
@@ -1,6 +1,7 @@
project('data install test', 'c')
install_data(sources : 'datafile.dat', install_dir : 'share/progname')
install_data(sources : 'etcfile.dat', install_dir : '/etc')
+install_data(files('fileobject_datafile.dat'), install_dir : 'share/progname')
subdir('vanishing')