summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2016-10-26 11:05:32 -0600
committerTom Rini <trini@konsulko.com>2016-10-28 22:10:43 -0400
commit0c5145fc29cf2377fa364aaf848eaf89b886cc28 (patch)
treee580f0d0e06aea0c0c9d8405961c5373b2d4de4a
parent43a68e49e13e94416a971a0e65499f1e87d3006d (diff)
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 <swarren@nvidia.com> Reviewed-by: Heiko Schocher <hs@denx.de>
-rw-r--r--.travis.yml7
1 files changed, 4 insertions, 3 deletions
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: