diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-05-25 11:52:49 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-05-26 10:17:32 +0200 |
| commit | b1399b0c851f36b4cd0185321cb620bf4e52f30b (patch) | |
| tree | 33d42074957fb4278ff521b23e5fe53ce91265d9 /tests/vm | |
| parent | a2696204de05fc3f57a2bc1c7762b9f5f2df594f (diff) | |
| download | qemu-b1399b0c851f36b4cd0185321cb620bf4e52f30b.zip qemu-b1399b0c851f36b4cd0185321cb620bf4e52f30b.tar.gz qemu-b1399b0c851f36b4cd0185321cb620bf4e52f30b.tar.bz2 | |
tests/vm: fix and simplify HOST_ARCH definition
ARCH is always empty, so just define HOST_ARCH as the result of uname.
The incorrect definition was not being used because the "ifeq" statement
is wrong; replace it with the same idiom based on $(realpath) that the
main Makefile uses.
With this change, vm-build-netbsd in a configured tree will not use
the PYTHONPATH hack.
Reported-by: John Snow <jsnow@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests/vm')
| -rw-r--r-- | tests/vm/Makefile.include | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 2cc2203..c2a8ca1 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -1,14 +1,12 @@ # Makefile for VM tests # Hack to allow running in an unconfigured build tree -ifeq ($(wildcard $(SRC_PATH)/config-host.mak),) +ifeq ($(realpath $(SRC_PATH)),$(realpath .)) VM_PYTHON = PYTHONPATH=$(SRC_PATH)/python /usr/bin/env python3 VM_VENV = -HOST_ARCH := $(shell uname -m) else VM_PYTHON = $(TESTS_PYTHON) VM_VENV = check-venv -HOST_ARCH = $(ARCH) endif .PHONY: vm-build-all vm-clean-all @@ -23,6 +21,7 @@ ARM64_IMAGES += ubuntu.aarch64 centos.aarch64 endif endif +HOST_ARCH = $(shell uname -m) ifeq ($(HOST_ARCH),x86_64) IMAGES=$(X86_IMAGES) $(if $(USE_TCG),$(ARM64_IMAGES)) else ifeq ($(HOST_ARCH),aarch64) |