tests/tcg: really fix path to target configuration

[PATCH for-7.0] tests/tcg: really fix path to target configuration

Paolo Bonzini posted 1 patch 3 years, 10 months ago

Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220329104514.815448-1-pbonzini@redhat.com

Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>

tests/tcg/Makefile.target | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Expand all Fold all

[PATCH for-7.0] tests/tcg: really fix path to target configuration

Posted by Paolo Bonzini 3 years, 10 months ago

This was attempted in commit 533b0a1a41 ("tests/tcg: Fix target-specific
Makefile variables path for user-mode", 2022-01-12) but it also used the
wrong path; default.mak is used for config/devices, not config/targets.

While at it, explain what the inclusion is about.

Cc: Alex Bennée <alex.bennee@linaro.org>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/tcg/Makefile.target | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index ae8004c76e..acda5bcec2 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -32,8 +32,10 @@
 all:
 -include ../../../config-host.mak
 -include ../config-$(TARGET).mak
+
+# Get semihosting definitions for user-mode emulation
 ifeq ($(CONFIG_USER_ONLY),y)
--include $(SRC_PATH)/configs/targets/$(TARGET)/default.mak
+-include $(SRC_PATH)/configs/targets/$(TARGET).mak
 endif
 
 # for including , in command strings
-- 
2.35.1

Re: [PATCH for-7.0] tests/tcg: really fix path to target configuration

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

On 29/3/22 12:45, Paolo Bonzini wrote:
> This was attempted in commit 533b0a1a41 ("tests/tcg: Fix target-specific
> Makefile variables path for user-mode", 2022-01-12) but it also used the
> wrong path; default.mak is used for config/devices, not config/targets.

I remember having tested this, so maybe I had dirty default.mak
files there? Sigh. Anyway:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> While at it, explain what the inclusion is about.
> 
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   tests/tcg/Makefile.target | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
> index ae8004c76e..acda5bcec2 100644
> --- a/tests/tcg/Makefile.target
> +++ b/tests/tcg/Makefile.target
> @@ -32,8 +32,10 @@
>   all:
>   -include ../../../config-host.mak
>   -include ../config-$(TARGET).mak
> +
> +# Get semihosting definitions for user-mode emulation
>   ifeq ($(CONFIG_USER_ONLY),y)
> --include $(SRC_PATH)/configs/targets/$(TARGET)/default.mak
> +-include $(SRC_PATH)/configs/targets/$(TARGET).mak
>   endif
>   
>   # for including , in command strings