diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-08-07 16:35:23 +0200 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2019-09-10 14:09:00 +0100 |
| commit | 2038f8c8775cf1a4eb190ab12f0c496e1ff79c88 (patch) | |
| tree | be79ba4fbfc977ea446e9087a65599e0d1c7fa7b /tests/tcg/multiarch | |
| parent | fc76c56d3f47e7b09eb0fd447f1b4dcc5d3ee717 (diff) | |
| download | focaccia-qemu-2038f8c8775cf1a4eb190ab12f0c496e1ff79c88.tar.gz focaccia-qemu-2038f8c8775cf1a4eb190ab12f0c496e1ff79c88.zip | |
tests/tcg: move configuration to a sub-shell script
Avoid the repeated inclusions of config-target.mak, which have risks of namespace pollution, and instead build minimal configuration files in a configuration script. The same configuration files can also be included in Makefile and Makefile.qemu [AJB 10/09/19] In the original PR this had inadvertently enabled tests for ppc64abi32. However as the rest of the multiarch tests work rather than disabling the otherwise correctly functioning build I've just skipped the failing linux-test test. For some reason I can't debug it with TCG so I'm leaving that to the PPC maintainers to look at. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20190807143523.15917-4-pbonzini@redhat.com> [AJB: s/docker/container/, rm last bits from configure, ppc6432abi hack] Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Cc: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'tests/tcg/multiarch')
| -rw-r--r-- | tests/tcg/multiarch/Makefile.target | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index b77084c146..6b1e30e2fe 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -12,8 +12,13 @@ VPATH += $(MULTIARCH_SRC) MULTIARCH_SRCS =$(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) MULTIARCH_TESTS =$(MULTIARCH_SRCS:.c=) +# FIXME: ppc64abi32 linux-test seems to have issues but the other basic tests work +ifeq ($(TARGET_NAME),ppc64abi32) +BROKEN_TESTS = linux-test +endif + # Update TESTS -TESTS +=$(MULTIARCH_TESTS) +TESTS += $(filter-out $(BROKEN_TESTS), $(MULTIARCH_TESTS)) # # The following are any additional rules needed to build things |