summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLaurent Vivier2018-06-05 18:09:58 +0200
committerLaurent Vivier2018-06-11 14:40:11 +0200
commit206d1b9c38daed50fcc08d2e743e649fbb82d60b (patch)
tree79918a3a109bbbe8b72c6a5bd5f4fa772d641c71 /tests
parentlinux-user: Use is_error() to avoid warnings and make the code clearer (diff)
downloadqemu-206d1b9c38daed50fcc08d2e743e649fbb82d60b.tar.gz
qemu-206d1b9c38daed50fcc08d2e743e649fbb82d60b.tar.xz
qemu-206d1b9c38daed50fcc08d2e743e649fbb82d60b.zip
linux-user: disable qemu-bridge-helper and socket_scm_helper build
linux-user targets don't need them, and if we ask to build statically linked binaries, some static libraries they need are not available. Signed-off-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <20180605160958.5434-1-laurent@vivier.eu>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.include2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include
index d098a104bb..10397ed159 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -930,7 +930,7 @@ check-report.html: check-report.xml
# Other tests
-QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
+QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
.PHONY: check-tests/qemu-iotests-quick.sh
check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)