summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/travis-test.sh15
1 files changed, 12 insertions, 3 deletions
diff --git a/scripts/travis-test.sh b/scripts/travis-test.sh
index f70a1ab6..3b7c9a13 100755
--- a/scripts/travis-test.sh
+++ b/scripts/travis-test.sh
@@ -18,17 +18,23 @@
set -o nounset
set -o errexit
+RTN=0
SCRIPT_DIR="$(cd "$(dirname "$0")"; pwd -P)"
source "${SCRIPT_DIR}/travis-common.sh"
+cd ${ROOT_DIR}
+
log_and_run() {
echo $*
- exec $*
+ if ! $*; then
+ echo "travis-test.sh: sub-command failed: $*"
+ RTN=1;
+ fi
}
run_tests() {
- (cd ${ROOT_DIR} && log_and_run test/run-tests.py --bindir ${BINDIR} $* --timeout=10) && true
- (log_and_run ${BINDIR}/wabt-unittests) && true
+ log_and_run test/run-tests.py -v --bindir ${BINDIR} $* --timeout=10
+ log_and_run ${BINDIR}/wabt-unittests
}
set_run_test_args() {
@@ -56,3 +62,6 @@ for BUILD_TYPE in ${BUILD_TYPES_UPPER}; do
fi
fi
done
+
+echo "travis-test.sh done: $RTN"
+exit $RTN