From 0c5145fc29cf2377fa364aaf848eaf89b886cc28 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 26 Oct 2016 11:05:32 -0600 Subject: travis-ci: use correct exit code on errors The phrase "if [ $? -ne 0 ]; then exit $?; fi" doesn't work correctly; by the time the "exit" statement runs, $? has already been over-written by the result of the [ command. Fix this by explicitly storing $? and then using that stored value in both the test and the error-case exit statement. This change also converts from textual comparison to integer comparison, since the exit code is an integer and there's no need to convert it to a string for comparison. Signed-off-by: Stephen Warren Reviewed-by: Heiko Schocher --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index f91e1bc271..33685ce147 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,11 +70,12 @@ script: - if [[ "${BUILDMAN}" != "" ]]; then set +e; tools/buildman/buildman ${BUILDMAN}; - if [[ "$?" == "0" || "$?" == "129" ]]; then + ret=$?; + if [[ $ret -eq 0 || $ret -eq 129 ]]; then exit 0; else - exit $?; - fi + exit $ret; + fi; fi matrix: -- cgit v1.2.3