aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorNicolas Schneider <nioncode+git@gmail.com>2016-05-26 13:08:33 +0200
committerNicolas Schneider <nioncode+git@gmail.com>2016-05-26 13:08:33 +0200
commita29d9c2c332bcf6147a6a87eeab408bc43fcd30b (patch)
tree51820af113b1c7070bb1b45f537ebe6abf05e7c5 /test cases
parent7aa24c7d0a68959e4d29c41d157ee30ff97153ad (diff)
downloadmeson-a29d9c2c332bcf6147a6a87eeab408bc43fcd30b.zip
meson-a29d9c2c332bcf6147a6a87eeab408bc43fcd30b.tar.gz
meson-a29d9c2c332bcf6147a6a87eeab408bc43fcd30b.tar.bz2
vs: fix generators that use indexed output replacements (like @OUTPUT0@)
Diffstat (limited to 'test cases')
-rw-r--r--test cases/common/59 object generator/meson.build8
-rw-r--r--test cases/common/59 object generator/prog.c3
-rw-r--r--test cases/common/59 object generator/source3.c3
3 files changed, 12 insertions, 2 deletions
diff --git a/test cases/common/59 object generator/meson.build b/test cases/common/59 object generator/meson.build
index fc31ed6..0bdefb8 100644
--- a/test cases/common/59 object generator/meson.build
+++ b/test cases/common/59 object generator/meson.build
@@ -20,6 +20,12 @@ gen = generator(python,
generated = gen.process(['source.c', 'source2.c'])
-e = executable('prog', 'prog.c', generated)
+# Generate an object file with indexed OUTPUT replacement.
+gen2 = generator(python,
+ output : outputname,
+ arguments : [comp, cc, '@INPUT@', '@OUTPUT0@'])
+generated2 = gen2.process(['source3.c'])
+
+e = executable('prog', 'prog.c', generated, generated2)
test('objgen', e) \ No newline at end of file
diff --git a/test cases/common/59 object generator/prog.c b/test cases/common/59 object generator/prog.c
index ba793f2..60459d6 100644
--- a/test cases/common/59 object generator/prog.c
+++ b/test cases/common/59 object generator/prog.c
@@ -1,6 +1,7 @@
int func1_in_obj();
int func2_in_obj();
+int func3_in_obj();
int main(int argc, char **argv) {
- return func1_in_obj() + func2_in_obj();
+ return func1_in_obj() + func2_in_obj() + func3_in_obj();
}
diff --git a/test cases/common/59 object generator/source3.c b/test cases/common/59 object generator/source3.c
new file mode 100644
index 0000000..1580f1e
--- /dev/null
+++ b/test cases/common/59 object generator/source3.c
@@ -0,0 +1,3 @@
+int func3_in_obj() {
+ return 0;
+}