From 60e1676651a0ba1b5a1ff6e6ed443421f878b8e2 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Mon, 20 May 2019 00:19:36 +0300
Subject: [PATCH] Combine the two different pipeline test dirs into one.

---
 test cases/common/27 pipeline/meson.build                    | 4 ++++
 .../common/{28 pipeline => 27 pipeline}/src/input_src.dat    | 0
 .../common/{28 pipeline => 27 pipeline}/src/meson.build      | 0
 test cases/common/{28 pipeline => 27 pipeline}/src/prog.c    | 0
 test cases/common/{28 pipeline => 27 pipeline}/src/srcgen.c  | 0
 test cases/common/28 pipeline/meson.build                    | 5 -----
 6 files changed, 4 insertions(+), 5 deletions(-)
 rename test cases/common/{28 pipeline => 27 pipeline}/src/input_src.dat (100%)
 rename test cases/common/{28 pipeline => 27 pipeline}/src/meson.build (100%)
 rename test cases/common/{28 pipeline => 27 pipeline}/src/prog.c (100%)
 rename test cases/common/{28 pipeline => 27 pipeline}/src/srcgen.c (100%)
 delete mode 100644 test cases/common/28 pipeline/meson.build

diff --git a/test cases/common/27 pipeline/meson.build b/test cases/common/27 pipeline/meson.build
index 200a6d8f2..bbb49d627 100644
--- a/test cases/common/27 pipeline/meson.build	
+++ b/test cases/common/27 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')
diff --git a/test cases/common/28 pipeline/src/input_src.dat b/test cases/common/27 pipeline/src/input_src.dat
similarity index 100%
rename from test cases/common/28 pipeline/src/input_src.dat
rename to test cases/common/27 pipeline/src/input_src.dat
diff --git a/test cases/common/28 pipeline/src/meson.build b/test cases/common/27 pipeline/src/meson.build
similarity index 100%
rename from test cases/common/28 pipeline/src/meson.build
rename to test cases/common/27 pipeline/src/meson.build
diff --git a/test cases/common/28 pipeline/src/prog.c b/test cases/common/27 pipeline/src/prog.c
similarity index 100%
rename from test cases/common/28 pipeline/src/prog.c
rename to test cases/common/27 pipeline/src/prog.c
diff --git a/test cases/common/28 pipeline/src/srcgen.c b/test cases/common/27 pipeline/src/srcgen.c
similarity index 100%
rename from test cases/common/28 pipeline/src/srcgen.c
rename to test cases/common/27 pipeline/src/srcgen.c
diff --git a/test cases/common/28 pipeline/meson.build b/test cases/common/28 pipeline/meson.build
deleted file mode 100644
index 0a430bde1..000000000
--- a/test cases/common/28 pipeline/meson.build	
+++ /dev/null
@@ -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')