aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-04-25 15:42:07 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2021-04-26 02:08:51 +0300
commita10a6284d2afc8657f94cd1f0833ce49edd50e35 (patch)
tree863e61217888cb3fcddcc0c6344f233a1ab65143
parent1a31882f597c0cbfd56fd38f6b8d4424104bdb0d (diff)
downloadmeson-a10a6284d2afc8657f94cd1f0833ce49edd50e35.zip
meson-a10a6284d2afc8657f94cd1f0833ce49edd50e35.tar.gz
meson-a10a6284d2afc8657f94cd1f0833ce49edd50e35.tar.bz2
Merge if and else tests to a single project.
-rw-r--r--test cases/common/15 if/meson.build12
-rw-r--r--test cases/common/16 else/meson.build11
-rw-r--r--test cases/common/16 else/prog.c1
3 files changed, 12 insertions, 12 deletions
diff --git a/test cases/common/15 if/meson.build b/test cases/common/15 if/meson.build
index b0288db..f8d8295 100644
--- a/test cases/common/15 if/meson.build
+++ b/test cases/common/15 if/meson.build
@@ -58,3 +58,15 @@ elif false
else
message('Ok')
endif
+
+# Test plain else
+
+var = false
+
+if var
+ exe = executable('break', 'break.c')
+else
+ exe = executable('eprog', 'prog.c')
+endif
+
+test('elsetest', exe)
diff --git a/test cases/common/16 else/meson.build b/test cases/common/16 else/meson.build
deleted file mode 100644
index 99cb927..0000000
--- a/test cases/common/16 else/meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
-project('else test', 'c')
-
-var = false
-
-if var
- exe = executable('break', 'break.c')
-else
- exe = executable('prog', 'prog.c')
-endif
-
-test('elsetest', exe)
diff --git a/test cases/common/16 else/prog.c b/test cases/common/16 else/prog.c
deleted file mode 100644
index 78f2de1..0000000
--- a/test cases/common/16 else/prog.c
+++ /dev/null
@@ -1 +0,0 @@
-int main(void) { return 0; }