Combine the two different pipeline test dirs into one.

6 years ago · 60e1676651
parent da1f663e8d
commit 60e1676651
6 changed files with 4 additions and 5 deletions
--- a/pipeline/meson.build
+++ b/pipeline/meson.build
@ -15,3 +15,7 @@ generated = gen.process(['input_src.dat'])
 e2 = executable('prog', 'prog.c', generated)

 test('pipelined', e2)
+
+# This is in a subdirectory to make sure
+# we write proper subdir paths to output.
+subdir('src')
--- a/pipeline/src/input_src.dat
+++ b/pipeline/src/input_src.dat
--- a/pipeline/src/meson.build
+++ b/pipeline/src/meson.build
--- a/pipeline/src/prog.c
+++ b/pipeline/src/prog.c
--- a/pipeline/src/srcgen.c
+++ b/pipeline/src/srcgen.c
--- a/pipeline/meson.build
+++ b/pipeline/meson.build
@ -1,5 +0,0 @@
-project('pipeline test', 'c')
-
-# This is in a subdirectory to make sure
-# we write proper subdir paths to output.
-subdir('src')