[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] docker: Fix test-mingw
From: |
Alistair Francis |
Subject: |
Re: [Qemu-devel] [PATCH] docker: Fix test-mingw |
Date: |
Mon, 25 Sep 2017 17:04:41 -0700 |
On Mon, Sep 25, 2017 at 1:29 AM, Fam Zheng <address@hidden> wrote:
> Feature "dtc" is explicitly required by test-mingw, but is not detected
> by the run script since we switched to archive-source.sh in b7f404201e4.
> Since it isn't available in the Fedora image which runs this test on
> patchew, the way we get dtc is still from submodule.
>
> archive-source.sh takes care of bundling the submodule files already, so
> what we need to do is just checking if files are there. Makefile is
> chosen because it is one that is unlikely to get renamed in the future.
>
> Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Thanks,
Alistair
> ---
> tests/docker/run | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/tests/docker/run b/tests/docker/run
> index c8f940de15..0fd2f358ce 100755
> --- a/tests/docker/run
> +++ b/tests/docker/run
> @@ -31,6 +31,9 @@ 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"
> +if test -f $TEST_DIR/src/Makefile; then
> + export FEATURES="$FEATURES dtc"
> +fi
>
> if test -n "$SHOW_ENV"; then
> if test -f /packages.txt; then
> --
> 2.13.5
>
>