[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 6/6] docker: Drop 'set -e' from run script
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v4 6/6] docker: Drop 'set -e' from run script |
Date: |
Tue, 5 Sep 2017 10:56:14 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
tests/docker/run | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/tests/docker/run b/tests/docker/run
index 9eb9165f76..aad91f6ef5 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
--
2.13.5
- [Qemu-devel] [PATCH v4 0/6] docker: Add test-block, Fam Zheng, 2017/09/04
- [Qemu-devel] [PATCH v4 1/6] docker: Fix return code of build_qemu(), Fam Zheng, 2017/09/04
- [Qemu-devel] [PATCH v4 2/6] docker: Add test_fail and prep_fail, Fam Zheng, 2017/09/04
- [Qemu-devel] [PATCH v4 3/6] docker: Use unconfined security profile, Fam Zheng, 2017/09/04
- [Qemu-devel] [PATCH v4 4/6] docker: Add nettle-devel to fedora image, Fam Zheng, 2017/09/04
- [Qemu-devel] [PATCH v4 5/6] docker: Add test-block, Fam Zheng, 2017/09/04
- [Qemu-devel] [PATCH v4 6/6] docker: Drop 'set -e' from run script,
Fam Zheng <=
- Re: [Qemu-devel] [PATCH v4 0/6] docker: Add test-block, Stefan Hajnoczi, 2017/09/05