[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] docker: Inline "prep_fail" in run script
|
From: |
Thomas Huth |
|
Subject: |
Re: [Qemu-devel] [PATCH] docker: Inline "prep_fail" in run script |
|
Date: |
Mon, 26 Mar 2018 11:20:00 +0200 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 |
On 26.03.2018 11:03, Fam Zheng wrote:
> We don't source common.rc where prep_fail is defined, so spell out the
> commands and do what was intended.
>
> Signed-off-by: Fam Zheng <address@hidden>
> ---
> tests/docker/run | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/docker/run b/tests/docker/run
> index 9dd362bb98..7aebf4b569 100755
> --- a/tests/docker/run
> +++ b/tests/docker/run
> @@ -29,7 +29,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 || prep_fail "Failed to untar source"
> +tar -C $TEST_DIR/src -xf $BASE/qemu.tar || { echo "Failed to untar source";
> exit 2; }
> if test -f $TEST_DIR/src/Makefile; then
> export FEATURES="$FEATURES dtc"
> fi
Reviewed-by: Thomas Huth <address@hidden>