aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Hutt <tim.hutt@ultrahaptics.com>2017-06-05 14:11:51 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2017-06-25 21:30:37 +0300
commit8d8c920a516e26040ce6686a9922b67f18380e34 (patch)
treee06816170a5dc0181a85cdd62518dfd7f73f043e
parent057f7e4aae6588b65278fc26736dbbcb90397137 (diff)
downloadmeson-8d8c920a516e26040ce6686a9922b67f18380e34.zip
meson-8d8c920a516e26040ce6686a9922b67f18380e34.tar.gz
meson-8d8c920a516e26040ce6686a9922b67f18380e34.tar.bz2
Make the 'silent or' test case not fail when it should
Previously it would have failed in two different ways depending on whether the parser bug was fixed. Now it will only fail if the parser bug is fixed.
-rw-r--r--test cases/failing/55 or on new line/meson.build8
1 files changed, 1 insertions, 7 deletions
diff --git a/test cases/failing/55 or on new line/meson.build b/test cases/failing/55 or on new line/meson.build
index b7fc89a..12f2705 100644
--- a/test cases/failing/55 or on new line/meson.build
+++ b/test cases/failing/55 or on new line/meson.build
@@ -1,13 +1,7 @@
project('silent_or', 'c')
-if get_option('foo') == 'true' or get_option('foo') == 'auto'
-
-else
- error('This case is fine - this error isn't triggered.')
-endif
-
if get_option('foo') == 'true'
or get_option('foo') == 'auto'
else
- error('This error is triggered because the or statement is silently ignored.')
+ message('If this message is printed then something is wrong. The or above should give a syntax error.')
endif