diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-05-20 00:19:36 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-05-20 23:38:13 +0300 |
| commit | 60e1676651a0ba1b5a1ff6e6ed443421f878b8e2 (patch) | |
| tree | 1f631970f1820fe91349a880731409abaa5865eb | |
| parent | da1f663e8d289f2dcd047c1b57b46c9e9edc7540 (diff) | |
| download | meson-60e1676651a0ba1b5a1ff6e6ed443421f878b8e2.zip meson-60e1676651a0ba1b5a1ff6e6ed443421f878b8e2.tar.gz meson-60e1676651a0ba1b5a1ff6e6ed443421f878b8e2.tar.bz2 | |
Combine the two different pipeline test dirs into one.
| -rw-r--r-- | test cases/common/27 pipeline/meson.build | 4 | ||||
| -rw-r--r-- | test cases/common/27 pipeline/src/input_src.dat (renamed from test cases/common/28 pipeline/src/input_src.dat) | 0 | ||||
| -rw-r--r-- | test cases/common/27 pipeline/src/meson.build (renamed from test cases/common/28 pipeline/src/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/common/27 pipeline/src/prog.c (renamed from test cases/common/28 pipeline/src/prog.c) | 0 | ||||
| -rw-r--r-- | test cases/common/27 pipeline/src/srcgen.c (renamed from test cases/common/28 pipeline/src/srcgen.c) | 0 | ||||
| -rw-r--r-- | test cases/common/28 pipeline/meson.build | 5 |
6 files changed, 4 insertions, 5 deletions
diff --git a/test cases/common/27 pipeline/meson.build b/test cases/common/27 pipeline/meson.build index 200a6d8..bbb49d6 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 index 354499a..354499a 100644 --- a/test cases/common/28 pipeline/src/input_src.dat +++ b/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 index 4e9ac11..4e9ac11 100644 --- a/test cases/common/28 pipeline/src/meson.build +++ b/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 index 29396b9..29396b9 100644 --- a/test cases/common/28 pipeline/src/prog.c +++ b/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 index 26761d2..26761d2 100644 --- a/test cases/common/28 pipeline/src/srcgen.c +++ b/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 0a430bd..0000000 --- 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') |