aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-09-27 01:08:35 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-10-02 00:50:21 +0530
commitf42d0f506331290869506b0405e7f4f1862d9c48 (patch)
tree769faf04209e5b48be6335d4f07912dbf5d7d964
parent207cdf28760d5fc51345e89604cc9a4d05960604 (diff)
downloadmeson-f42d0f506331290869506b0405e7f4f1862d9c48.zip
meson-f42d0f506331290869506b0405e7f4f1862d9c48.tar.gz
meson-f42d0f506331290869506b0405e7f4f1862d9c48.tar.bz2
Add a vala test for generated sources in subdirs
Modified from a test case provided by @benwaffle on https://github.com/mesonbuild/meson/issues/815
-rw-r--r--test cases/vala/8 generated source/installed_files.txt1
-rw-r--r--test cases/vala/8 generated source/meson.build7
-rw-r--r--test cases/vala/8 generated source/src/config.vala.in3
-rw-r--r--test cases/vala/8 generated source/src/meson.build5
-rw-r--r--test cases/vala/8 generated source/src/test.vala3
-rw-r--r--test cases/vala/8 generated source/tools/meson.build3
6 files changed, 22 insertions, 0 deletions
diff --git a/test cases/vala/8 generated source/installed_files.txt b/test cases/vala/8 generated source/installed_files.txt
new file mode 100644
index 0000000..a4c37f6
--- /dev/null
+++ b/test cases/vala/8 generated source/installed_files.txt
@@ -0,0 +1 @@
+usr/bin/generatedtest
diff --git a/test cases/vala/8 generated source/meson.build b/test cases/vala/8 generated source/meson.build
new file mode 100644
index 0000000..7271821
--- /dev/null
+++ b/test cases/vala/8 generated source/meson.build
@@ -0,0 +1,7 @@
+project('mytest', 'vala', 'c')
+
+cd = configuration_data()
+cd.set('x', 'y')
+
+subdir('src')
+subdir('tools')
diff --git a/test cases/vala/8 generated source/src/config.vala.in b/test cases/vala/8 generated source/src/config.vala.in
new file mode 100644
index 0000000..a5196fd
--- /dev/null
+++ b/test cases/vala/8 generated source/src/config.vala.in
@@ -0,0 +1,3 @@
+namespace Config {
+ public static const string x = "@x@";
+}
diff --git a/test cases/vala/8 generated source/src/meson.build b/test cases/vala/8 generated source/src/meson.build
new file mode 100644
index 0000000..9096c67
--- /dev/null
+++ b/test cases/vala/8 generated source/src/meson.build
@@ -0,0 +1,5 @@
+config = configure_file(input: 'config.vala.in',
+ output: 'config.vala',
+ configuration: cd)
+
+src = files('test.vala')
diff --git a/test cases/vala/8 generated source/src/test.vala b/test cases/vala/8 generated source/src/test.vala
new file mode 100644
index 0000000..98d6821
--- /dev/null
+++ b/test cases/vala/8 generated source/src/test.vala
@@ -0,0 +1,3 @@
+void main() {
+ print (Config.x);
+}
diff --git a/test cases/vala/8 generated source/tools/meson.build b/test cases/vala/8 generated source/tools/meson.build
new file mode 100644
index 0000000..834ec1a
--- /dev/null
+++ b/test cases/vala/8 generated source/tools/meson.build
@@ -0,0 +1,3 @@
+executable('generatedtest', [src, config],
+ install : true,
+ dependencies: [dependency('glib-2.0'), dependency('gobject-2.0')])