[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 25/37] docker: Drop 'set -e' from run script
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL v2 25/37] docker: Drop 'set -e' from run script |
Date: |
Sat, 9 Sep 2017 13:46:01 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Based-on: 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 v2 15/37] tests: Add OpenBSD image, (continued)
- [Qemu-devel] [PULL v2 15/37] tests: Add OpenBSD image, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 17/37] MAINTAINERS: Add tests/vm entry, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 19/37] docker: Use archive-source.py, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 18/37] tests: Add README for vm tests, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 20/37] docker: Fix return code of build_qemu(), Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 21/37] docker: Add test_fail and prep_fail, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 22/37] docker: Use unconfined security profile, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 23/37] docker: Add nettle-devel to fedora image, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 26/37] vl: Don't include vde header, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 24/37] docker: Add test-block, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 25/37] docker: Drop 'set -e' from run script,
Fam Zheng <=
- [Qemu-devel] [PULL v2 27/37] buildsys: Move vde libs to per object, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 28/37] buildsys: Move gtk/vte cflags/libs to per object, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 29/37] buildsys: Move sdl cflags/libs to per object, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 31/37] buildsys: Move audio libs to per object, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 30/37] buildsys: Move vnc cflags/libs to per object, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 32/37] buildsys: Move curese cflags/libs to per object, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 33/37] buildsys: Move libcacard cflags/libs to per object, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 35/37] buildsys: Move usb redir cflags/libs to per object, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 34/37] buildsys: Move libusb cflags/libs to per object, Fam Zheng, 2017/09/09
- [Qemu-devel] [PULL v2 36/37] buildsys: Move brlapi libs to per object, Fam Zheng, 2017/09/09