* [Qemu-devel] [PATCH] docker: Inline "prep_fail" in run script
@ 2018-03-26 9:03 Fam Zheng
2018-03-26 9:20 ` Thomas Huth
2018-04-04 6:52 ` Fam Zheng
0 siblings, 2 replies; 3+ messages in thread
From: Fam Zheng @ 2018-03-26 9:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Fam Zheng, Alex Bennée, Philippe Mathieu-Daudé
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 <famz@redhat.com>
---
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
--
2.14.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] docker: Inline "prep_fail" in run script
2018-03-26 9:03 [Qemu-devel] [PATCH] docker: Inline "prep_fail" in run script Fam Zheng
@ 2018-03-26 9:20 ` Thomas Huth
2018-04-04 6:52 ` Fam Zheng
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Huth @ 2018-03-26 9:20 UTC (permalink / raw)
To: Fam Zheng, qemu-devel; +Cc: Alex Bennée, Philippe Mathieu-Daudé
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 <famz@redhat.com>
> ---
> 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 <thuth@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] docker: Inline "prep_fail" in run script
2018-03-26 9:03 [Qemu-devel] [PATCH] docker: Inline "prep_fail" in run script Fam Zheng
2018-03-26 9:20 ` Thomas Huth
@ 2018-04-04 6:52 ` Fam Zheng
1 sibling, 0 replies; 3+ messages in thread
From: Fam Zheng @ 2018-04-04 6:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Alex Bennée, Philippe Mathieu-Daudé
On Mon, 03/26 17: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 <famz@redhat.com>
> ---
> 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
> --
> 2.14.3
>
Queued, thanks!
Fam
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-04 6:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-26 9:03 [Qemu-devel] [PATCH] docker: Inline "prep_fail" in run script Fam Zheng
2018-03-26 9:20 ` Thomas Huth
2018-04-04 6:52 ` Fam Zheng
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.