tests/tcg: Use $cpu in configure.sh

[PATCH] tests/tcg: Use $cpu in configure.sh

Richard Henderson posted 1 patch 2 years, 4 months ago

Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20211224212117.2404218-1-richard.henderson@linaro.org

configure              | 2 +-
tests/tcg/configure.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH] tests/tcg: Use $cpu in configure.sh

Posted by Richard Henderson 2 years, 4 months ago

Use $cpu instead of $ARCH, which has been removed from
the top-level configure.

Fixes: 823eb013452e
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 configure              | 2 +-
 tests/tcg/configure.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index eb977e5b6f..030728d11e 100755
--- a/configure
+++ b/configure
@@ -3821,7 +3821,7 @@ done
 (for i in $cross_cc_vars; do
   export $i
 done
-export target_list source_path use_containers ARCH
+export target_list source_path use_containers cpu
 $source_path/tests/tcg/configure.sh)
 
 # temporary config to build submodules
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 9ef913df5b..8eb4287c84 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -326,7 +326,7 @@ for target in $target_list; do
   elif test $got_cross_cc = no && test "$container" != no && \
           test -n "$container_image"; then
       for host in $container_hosts; do
-          if test "$host" = "$ARCH"; then
+          if test "$host" = "$cpu"; then
               echo "DOCKER_IMAGE=$container_image" >> $config_target_mak
               echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> \
                    $config_target_mak
-- 
2.25.1

Re: [PATCH] tests/tcg: Use $cpu in configure.sh

Posted by Philippe Mathieu-Daudé 2 years, 4 months ago

On 12/24/21 22:21, Richard Henderson wrote:
> Use $cpu instead of $ARCH, which has been removed from
> the top-level configure.
> 
> Fixes: 823eb013452e

Fixes: 823eb013452 ("configure, meson: move ARCH to meson.build")

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

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  configure              | 2 +-
>  tests/tcg/configure.sh | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)