]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Revert "Makefile: include tests/Makefile.include before ninja calculation"
authorAlex Bennée <alex.bennee@linaro.org>
Mon, 1 Jun 2026 14:31:27 +0000 (15:31 +0100)
committerAlex Bennée <alex.bennee@linaro.org>
Mon, 1 Jun 2026 16:16:10 +0000 (17:16 +0100)
This reverts commit fd63125b9089610d63a53c11ff2fda6b53a2265d which
broke the ability to run the check-functional-FOO series of tests.

We will need to try something else for the MacOS builds.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Tested-by: Cornelia Huck <cohuck@redhat.com> # running tests on an s390x
Message-ID: <20260601143129.144786-2-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Makefile

index 829c51e364cfb024cc71820360384069e9a9e62b..54547a37b1acdd1a6cea80f72158ab4795512742 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,8 +45,6 @@ include config-host.mak
 include Makefile.prereqs
 Makefile.prereqs: config-host.mak
 
-include $(SRC_PATH)/tests/Makefile.include
-
 # 0. ensure the build tree is okay
 
 # Check that we're not trying to do an out-of-tree build from
@@ -182,6 +180,8 @@ endif # config-host.mak does not exist
 
 SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet)
 
+include $(SRC_PATH)/tests/Makefile.include
+
 all: recurse-all
 
 SUBDIR_RULES=$(foreach t, all clean distclean, $(addsuffix /$(t), $(SUBDIRS)))