Not all of the multiarch tests are pure POSIX so elide over those tests on a non-Linux system. This allows for at least some of the tests to be nominally usable by *BSD user builds.
Signed-off-by: Alex Bennée <alex.ben...@linaro.org> Cc: Warner Losh <i...@bsdimp.com> --- tests/tcg/multiarch/Makefile.target | 6 +++++- tests/tcg/x86_64/Makefile.target | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index 85a6fb7a2e..38ee0f1dec 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -10,7 +10,11 @@ MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch # Set search path for all sources VPATH += $(MULTIARCH_SRC) MULTIARCH_SRCS =$(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) -MULTIARCH_TESTS =$(filter-out float_helpers, $(MULTIARCH_SRCS:.c=)) +MULTIARCH_SKIP=float_helpers +ifeq ($(CONFIG_LINUX),) +MULTIARCH_SKIP+=linux-test +endif +MULTIARCH_TESTS =$(filter-out $(MULTIARCH_SKIP),$(MULTIARCH_SRCS:.c=)) # # The following are any additional rules needed to build things diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.target index 2151ea6302..d7a7385583 100644 --- a/tests/tcg/x86_64/Makefile.target +++ b/tests/tcg/x86_64/Makefile.target @@ -8,8 +8,12 @@ include $(SRC_PATH)/tests/tcg/i386/Makefile.target +ifneq ($(CONFIG_LINUX),) X86_64_TESTS += vsyscall TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 +else +TESTS=$(MULTIARCH_TESTS) +endif QEMU_OPTS += -cpu max test-x86_64: LDFLAGS+=-lm -lc -- 2.30.2
