[v2] various docker fixes

[Qemu-devel] [PATCH v2 for 3.0 05/16] docker: split configure_qemu from build_qemu

Posted by Alex Bennée 7 years, 3 months ago

This allows some tests that just want to configure QEMU's source tree
to do so.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/docker/common.rc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/docker/common.rc b/tests/docker/common.rc
index 046f8a5921..ba1f942328 100755
--- a/tests/docker/common.rc
+++ b/tests/docker/common.rc
@@ -21,7 +21,7 @@ requires()
     done
 }
 
-build_qemu()
+configure_qemu()
 {
     config_opts="--enable-werror \
                  ${TARGET_LIST:+--target-list=${TARGET_LIST}} \
@@ -32,6 +32,11 @@ build_qemu()
     echo $config_opts
     $QEMU_SRC/configure $config_opts || \
         { cat config.log && test_fail "Failed to run 'configure'"; }
+}
+
+build_qemu()
+{
+    configure_qemu $@
     make $MAKEFLAGS
 }
 
-- 
2.17.1

Re: [Qemu-devel] [PATCH v2 for 3.0 05/16] docker: split configure_qemu from build_qemu

Posted by Philippe Mathieu-Daudé 7 years, 3 months ago

On 07/13/2018 09:17 AM, Alex Bennée wrote:
> This allows some tests that just want to configure QEMU's source tree
> to do so.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  tests/docker/common.rc | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/docker/common.rc b/tests/docker/common.rc
> index 046f8a5921..ba1f942328 100755
> --- a/tests/docker/common.rc
> +++ b/tests/docker/common.rc
> @@ -21,7 +21,7 @@ requires()
>      done
>  }
>  
> -build_qemu()
> +configure_qemu()
>  {
>      config_opts="--enable-werror \
>                   ${TARGET_LIST:+--target-list=${TARGET_LIST}} \
> @@ -32,6 +32,11 @@ build_qemu()
>      echo $config_opts
>      $QEMU_SRC/configure $config_opts || \
>          { cat config.log && test_fail "Failed to run 'configure'"; }
> +}
> +
> +build_qemu()
> +{
> +    configure_qemu $@
>      make $MAKEFLAGS
>  }
>  
>