diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2018-07-04 07:30:11 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2018-07-05 15:59:41 +0100 |
| commit | 2b1f35b9a85cf0232615a67e7ff523137a58795e (patch) | |
| tree | a54da70df00d6725d67c443bb9d6cd67d005484a /tests | |
| parent | 6cf495be0b445789eeb7e88a6015c8cf74d4c1cf (diff) | |
| download | qemu-2b1f35b9a85cf0232615a67e7ff523137a58795e.zip qemu-2b1f35b9a85cf0232615a67e7ff523137a58795e.tar.gz qemu-2b1f35b9a85cf0232615a67e7ff523137a58795e.tar.bz2 | |
Revert "Makefile: Rename TARGET_DIRS to TARGET_LIST"
This reverts commit 208ecb3e1acc8d55dab49fdf721a86d513691688. This was
causing problems by making DEF_TARGET_LIST pointless and having to
jump through hoops to build on mingw with a dully enabled config.
This includes a change to fix the per-guest TCG test probe which was
added after 208ecb3 and used TARGET_LIST.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.include | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 1affc49..0c0f950 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -874,7 +874,7 @@ endif # QTest rules -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST))) +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) ifeq ($(CONFIG_POSIX),y) QTEST_TARGETS = $(TARGETS) check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y)) @@ -938,14 +938,14 @@ check-report.html: check-report.xml # Per guest TCG tests -LINUX_USER_TARGETS=$(filter %-linux-user,$(TARGET_LIST)) +LINUX_USER_TARGETS=$(filter %-linux-user,$(TARGET_DIRS)) BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(LINUX_USER_TARGETS)) CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(LINUX_USER_TARGETS)) RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(LINUX_USER_TARGETS)) ifeq ($(HAVE_USER_DOCKER),y) # Probe for the Docker Builds needed for each build -$(foreach PROBE_TARGET,$(TARGET_LIST), \ +$(foreach PROBE_TARGET,$(TARGET_DIRS), \ $(eval -include $(SRC_PATH)/tests/tcg/Makefile.probe) \ $(if $(DOCKER_PREREQ), \ $(eval build-tcg-tests-$(PROBE_TARGET): $(DOCKER_PREREQ)))) |