[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 36/36] docker: Drop 'set -e' from run script
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 36/36] docker: Drop 'set -e' from run script |
Date: |
Fri, 22 Sep 2017 15:46:59 +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 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
--
2.13.5
- [Qemu-devel] [PULL 26/36] tests: Add a test key pair, (continued)
- [Qemu-devel] [PULL 26/36] tests: Add a test key pair, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 25/36] scripts: Add archive-source.sh, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 27/36] tests: Add vm test lib, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 28/36] tests: Add ubuntu.i386 image, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 29/36] tests: Add FreeBSD image, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 30/36] tests: Add NetBSD image, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 31/36] tests: Add OpenBSD image, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 32/36] Makefile: Add rules to run vm tests, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 33/36] MAINTAINERS: Add tests/vm entry, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 34/36] tests: Add README for vm tests, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 36/36] docker: Drop 'set -e' from run script,
Fam Zheng <=
- [Qemu-devel] [PULL 35/36] docker: Use archive-source.py, Fam Zheng, 2017/09/22
- Re: [Qemu-devel] [PULL v5 00/36] Build and test automation patches, Peter Maydell, 2017/09/22