From: Alex Bennée <alex.bennee@linaro.org>
Date: Thu, 29 Nov 2018 22:21:50 +0000 (+0000)
Subject: tests/tcg: enable tcg tests for softmmu
X-Git-Tag: v4.0.0-rc0~17^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e24e66f06d152151cd876210e001b21aa3bb86c8;p=thirdparty%2Fqemu.git

tests/tcg: enable tcg tests for softmmu

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/Makefile.target b/Makefile.target
index d8048aab8f2..ae02495951d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -40,9 +40,7 @@ PROGS=$(QEMU_PROG) $(QEMU_PROGW)
 STPFILES=
 
 # Makefile Tests
-ifdef CONFIG_USER_ONLY
 include $(SRC_PATH)/tests/tcg/Makefile.include
-endif
 
 config-target.h: config-target.h-timestamp
 config-target.h-timestamp: config-target.mak
diff --git a/tests/Makefile.include b/tests/Makefile.include
index a5719551dd1..75b682cbe87 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1061,10 +1061,9 @@ endif
 
 # Per guest TCG tests
 
-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))
+BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS))
+CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS))
+RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS))
 
 ifeq ($(HAVE_USER_DOCKER),y)
 # Probe for the Docker Builds needed for each build