aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2017-09-05 10:56:14 +0800
committerFam Zheng <famz@redhat.com>2017-09-22 14:51:43 +0800
commit4f6afe41f2ee3d8170eef7a9122d256588b707b2 (patch)
tree47aa421a60ac646d0aa40711f5ffb9a9e4fc28f5
parentb7f404201e45e99da23b9764dec27ce5f965cdcd (diff)
docker: Drop 'set -e' from run script
Signed-off-by: Fam Zheng <famz@redhat.com>
-rwxr-xr-xtests/docker/run8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/docker/run b/tests/docker/run
index 52b76e443d..c8f940de15 100755
--- a/tests/docker/run
+++ b/tests/docker/run
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
#
# Docker test runner
#
@@ -11,8 +11,6 @@
# or (at your option) any later version. See the COPYING file in
# the top-level directory.
-set -e
-
if test -n "$V"; then
set -x
fi
@@ -20,7 +18,7 @@ fi
BASE="$(dirname $(readlink -e $0))"
# Prepare the environment
-. /etc/profile || true
+. /etc/profile
export PATH=/usr/lib/ccache:$PATH
if test -n "$J"; then
@@ -32,7 +30,7 @@ export TEST_DIR=/tmp/qemu-test
mkdir -p $TEST_DIR/{src,build,install}
# Extract the source tarballs
-tar -C $TEST_DIR/src -xf $BASE/qemu.tar
+tar -C $TEST_DIR/src -xf $BASE/qemu.tar || prep_fail "Failed to untar source"
if test -n "$SHOW_ENV"; then
if test -f /packages.txt; then