[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 13/17] tests/tcg: gate pauth-% tests on having compiler suppor
From: |
Alex Bennée |
Subject: |
[PATCH v3 13/17] tests/tcg: gate pauth-% tests on having compiler support |
Date: |
Mon, 3 Feb 2020 09:09:28 +0000 |
Otherwise we end up failing to build our tests on CI which may have
older compilers that the user expects. We can get rid of this once we
can fallback to multiarch containers.
Signed-off-by: Alex Bennée <address@hidden>
---
tests/tcg/aarch64/Makefile.softmmu-target | 12 +++++++++---
tests/tcg/aarch64/Makefile.target | 2 ++
tests/tcg/configure.sh | 4 ++++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/tests/tcg/aarch64/Makefile.softmmu-target
b/tests/tcg/aarch64/Makefile.softmmu-target
index f6b5121f5ce..d2299b98b76 100644
--- a/tests/tcg/aarch64/Makefile.softmmu-target
+++ b/tests/tcg/aarch64/Makefile.softmmu-target
@@ -61,7 +61,13 @@ run-memory-replay: memory-replay run-memory-record
$(QEMU_OPTS) memory, \
"$< on $(TARGET_NAME)")
-run-pauth-3: pauth-3
-pauth-3: CFLAGS += -march=armv8.3-a
+EXTRA_TESTS+=memory-record memory-replay
-EXTRA_TESTS+=memory-record memory-replay pauth-3
+ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),)
+pauth-3: CFLAGS += -march=armv8.3-a
+else
+pauth-3:
+ $(call skip-test, "BUILD of $@", "missing compiler support")
+run-pauth-3:
+ $(call skip-test, "RUN of pauth-3", "not built")
+endif
diff --git a/tests/tcg/aarch64/Makefile.target
b/tests/tcg/aarch64/Makefile.target
index efa67cf1e9e..8ed477d0d51 100644
--- a/tests/tcg/aarch64/Makefile.target
+++ b/tests/tcg/aarch64/Makefile.target
@@ -18,9 +18,11 @@ run-fcvt: fcvt
$(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref)
# Pauth Tests
+ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),)
AARCH64_TESTS += pauth-1 pauth-2 pauth-4
run-pauth-%: QEMU_OPTS += -cpu max
pauth-%: CFLAGS += -march=armv8.3-a
+endif
# Semihosting smoke test for linux-user
AARCH64_TESTS += semihosting
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index e0d1fbb182f..9eb6ba3b7ea 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -227,6 +227,10 @@ for target in $target_list; do
-march=armv8.1-a+sve -o $TMPE $TMPC; then
echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak
fi
+ if do_compiler "$target_compiler" $target_compiler_cflags \
+ -march=-march=armv8.3-a -o $TMPE $TMPC; then
+ echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak
+ fi
;;
esac
--
2.20.1
- [PATCH v3 05/17] .shippable: --disable-docs for cross-compile tests, (continued)
- [PATCH v3 05/17] .shippable: --disable-docs for cross-compile tests, Alex Bennée, 2020/02/03
- [PATCH v3 06/17] hw/hppa/Kconfig: LASI chipset requires PARALLEL port, Alex Bennée, 2020/02/03
- [PATCH v3 07/17] .travis.yml: Drop superfluous use of --python=python3 parameter, Alex Bennée, 2020/02/03
- [PATCH v3 09/17] .travis.yml: build documents under bionic, Alex Bennée, 2020/02/03
- [PATCH v3 10/17] .travis.yml: move cache flushing to early common phase, Alex Bennée, 2020/02/03
- [PATCH v3 08/17] .travis.yml: Add description to each job, Alex Bennée, 2020/02/03
- [PATCH v3 12/17] tests/tcg: add a configure compiler check for ARMv8.1 and SVE, Alex Bennée, 2020/02/03
- [PATCH v3 14/17] .travis.yml: introduce TEST_BUILD_CMD and use it for check-tcg, Alex Bennée, 2020/02/03
- [PATCH v3 11/17] .travis.yml: probe for number of available processors, Alex Bennée, 2020/02/03
- [PATCH v3 13/17] tests/tcg: gate pauth-% tests on having compiler support,
Alex Bennée <=
- [PATCH v3 16/17] .travis.yml: drop cris-linux-user from the plugins test, Alex Bennée, 2020/02/03
- [PATCH v3 15/17] .travis.yml: drop the travis_retry from tests, Alex Bennée, 2020/02/03
- [PATCH v3 17/17] .travis.yml: single thread build-tcg, Alex Bennée, 2020/02/03