From 3032c2b58093e17d0bde1d4d49fb4f8236eecd77 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Sat, 15 Oct 2016 05:56:26 +0530
Subject: [PATCH] Add generated C file to mixed sources Vala test

This tests that generated C files make it past the filtering in
generate_vale_compile().
---
 test cases/vala/11 mixed sources/c/foo.c             |  5 +++++
 test cases/vala/11 mixed sources/c/meson.build       |  5 +++++
 test cases/vala/11 mixed sources/c/writec.py         | 12 ++++++++++++
 test cases/vala/11 mixed sources/foo.c               |  3 ---
 test cases/vala/11 mixed sources/meson.build         |  4 +++-
 test cases/vala/11 mixed sources/{ => vala}/bar.vala |  0
 6 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 test cases/vala/11 mixed sources/c/foo.c
 create mode 100644 test cases/vala/11 mixed sources/c/meson.build
 create mode 100644 test cases/vala/11 mixed sources/c/writec.py
 delete mode 100644 test cases/vala/11 mixed sources/foo.c
 rename test cases/vala/11 mixed sources/{ => vala}/bar.vala (100%)

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 000000000..f3c6fb885
--- /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 000000000..ead05757e
--- /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 000000000..2cc822bae
--- /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 05910a6f9..000000000
--- 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 c84c8cdad..75b8ecda2 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
similarity index 100%
rename from test cases/vala/11 mixed sources/bar.vala
rename to test cases/vala/11 mixed sources/vala/bar.vala