aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test cases/vala/11 mixed sources/c/foo.c5
-rw-r--r--test cases/vala/11 mixed sources/c/meson.build5
-rw-r--r--test cases/vala/11 mixed sources/c/writec.py12
-rw-r--r--test cases/vala/11 mixed sources/foo.c3
-rw-r--r--test cases/vala/11 mixed sources/meson.build4
-rw-r--r--test cases/vala/11 mixed sources/vala/bar.vala (renamed from test cases/vala/11 mixed sources/bar.vala)0
6 files changed, 25 insertions, 4 deletions
diff --git a/test cases/vala/11 mixed sources/c/foo.c b/test cases/vala/11 mixed sources/c/foo.c
new file mode 100644
index 0000000..f3c6fb8
--- /dev/null
+++ b/test cases/vala/11 mixed sources/c/foo.c
@@ -0,0 +1,5 @@
+int retval (void);
+
+int test (void) {
+ return retval ();
+}
diff --git a/test cases/vala/11 mixed sources/c/meson.build b/test cases/vala/11 mixed sources/c/meson.build
new file mode 100644
index 0000000..ead0575
--- /dev/null
+++ b/test cases/vala/11 mixed sources/c/meson.build
@@ -0,0 +1,5 @@
+writec = find_program('writec.py')
+
+retval = custom_target('writec',
+ output : 'retval.c',
+ command : [writec, '@OUTPUT@'])
diff --git a/test cases/vala/11 mixed sources/c/writec.py b/test cases/vala/11 mixed sources/c/writec.py
new file mode 100644
index 0000000..2cc822b
--- /dev/null
+++ b/test cases/vala/11 mixed sources/c/writec.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+
+import sys
+
+c = '''int
+retval(void) {
+ return 0;
+}
+'''
+
+with open(sys.argv[1], 'w') as f:
+ f.write(c)
diff --git a/test cases/vala/11 mixed sources/foo.c b/test cases/vala/11 mixed sources/foo.c
deleted file mode 100644
index 05910a6..0000000
--- a/test cases/vala/11 mixed sources/foo.c
+++ /dev/null
@@ -1,3 +0,0 @@
-int test () {
- return 0;
-}
diff --git a/test cases/vala/11 mixed sources/meson.build b/test cases/vala/11 mixed sources/meson.build
index c84c8cd..75b8ecd 100644
--- a/test cases/vala/11 mixed sources/meson.build
+++ b/test cases/vala/11 mixed sources/meson.build
@@ -2,4 +2,6 @@ project('foo', 'c', 'vala')
glib = dependency('glib-2.0')
-executable('foo', 'foo.c', 'bar.vala', dependencies: [glib])
+subdir('c')
+e = executable('foo', 'c/foo.c', retval, 'vala/bar.vala', dependencies: [glib])
+test('test foo', e)
diff --git a/test cases/vala/11 mixed sources/bar.vala b/test cases/vala/11 mixed sources/vala/bar.vala
index 10dce1e..10dce1e 100644
--- a/test cases/vala/11 mixed sources/bar.vala
+++ b/test cases/vala/11 mixed sources/vala/bar.vala