aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-11-13 21:19:30 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-11-13 21:19:30 +0200
commitc04e04146e6a72db58c9f5c4a669e72b1bb89357 (patch)
tree3a67b2c50934ff4fe3b2fa05bd9d22c30acbd510
parent24f35d0425942180a3c0119c6ee2addbf0d027ca (diff)
downloadmeson-c04e04146e6a72db58c9f5c4a669e72b1bb89357.zip
meson-c04e04146e6a72db58c9f5c4a669e72b1bb89357.tar.gz
meson-c04e04146e6a72db58c9f5c4a669e72b1bb89357.tar.bz2
Use two inputs for a generator to test edge cases.
-rw-r--r--test cases/common/59 object generator/meson.build2
-rw-r--r--test cases/common/59 object generator/prog.c5
-rw-r--r--test cases/common/59 object generator/source.c2
-rw-r--r--test cases/common/59 object generator/source2.c3
4 files changed, 8 insertions, 4 deletions
diff --git a/test cases/common/59 object generator/meson.build b/test cases/common/59 object generator/meson.build
index 761ef77..fc31ed6 100644
--- a/test cases/common/59 object generator/meson.build
+++ b/test cases/common/59 object generator/meson.build
@@ -18,7 +18,7 @@ gen = generator(python,
output : outputname,
arguments : [comp, cc, '@INPUT@', '@OUTPUT@'])
-generated = gen.process('source.c')
+generated = gen.process(['source.c', 'source2.c'])
e = executable('prog', 'prog.c', generated)
diff --git a/test cases/common/59 object generator/prog.c b/test cases/common/59 object generator/prog.c
index ce5c1cb..ba793f2 100644
--- a/test cases/common/59 object generator/prog.c
+++ b/test cases/common/59 object generator/prog.c
@@ -1,5 +1,6 @@
-int func_in_obj();
+int func1_in_obj();
+int func2_in_obj();
int main(int argc, char **argv) {
- return func_in_obj();
+ return func1_in_obj() + func2_in_obj();
}
diff --git a/test cases/common/59 object generator/source.c b/test cases/common/59 object generator/source.c
index a6920d1..7779b33 100644
--- a/test cases/common/59 object generator/source.c
+++ b/test cases/common/59 object generator/source.c
@@ -1,3 +1,3 @@
-int func_in_obj() {
+int func1_in_obj() {
return 0;
}
diff --git a/test cases/common/59 object generator/source2.c b/test cases/common/59 object generator/source2.c
new file mode 100644
index 0000000..29aad40
--- /dev/null
+++ b/test cases/common/59 object generator/source2.c
@@ -0,0 +1,3 @@
+int func2_in_obj() {
+ return 0;
+}