aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/mesonmain.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-02-18 13:54:50 +0200
committerGitHub <noreply@github.com>2018-02-18 13:54:50 +0200
commit55a7c265c11e0f3e8a94cf9f4fd0b5f036a717d2 (patch)
tree29e6686ece50f119e8a4e850653c221b6872b975 /mesonbuild/mesonmain.py
parent1841d53a84be13a3ba989b917930b824aafdac26 (diff)
parent7297e9f7a3581d132b0bccc47da4435c7315c74b (diff)
downloadmeson-55a7c265c11e0f3e8a94cf9f4fd0b5f036a717d2.zip
meson-55a7c265c11e0f3e8a94cf9f4fd0b5f036a717d2.tar.gz
meson-55a7c265c11e0f3e8a94cf9f4fd0b5f036a717d2.tar.bz2
Merge pull request #2863 from jon-turney/exit-status-on-exception
Verify that failing tests are failing with an error, not a python exception
Diffstat (limited to 'mesonbuild/mesonmain.py')
-rw-r--r--mesonbuild/mesonmain.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 073e505..7966d70 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -376,11 +376,12 @@ def run(original_args, mainfile=None):
mlog.log("\nA full log can be found at", mlog.bold(logfile))
if os.environ.get('MESON_FORCE_BACKTRACE'):
raise
+ return 1
else:
if os.environ.get('MESON_FORCE_BACKTRACE'):
raise
traceback.print_exc()
- return 1
+ return 2
finally:
mlog.shutdown()