[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/16] tests/tcg: gate pauth-% tests on having compiler support
From: |
Alex Bennée |
Subject: |
[PULL 11/16] tests/tcg: gate pauth-% tests on having compiler support |
Date: |
Tue, 4 Feb 2020 18:40:23 +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>
Message-Id: <address@hidden>
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
- [PULL 00/16] testing updates, Alex Bennée, 2020/02/04
- [PULL 04/16] .shippable: --disable-docs for cross-compile tests, Alex Bennée, 2020/02/04
- [PULL 01/16] tests/docker: move most cross compilers to buster base, Alex Bennée, 2020/02/04
- [PULL 03/16] travis.yml: Install genisoimage package, Alex Bennée, 2020/02/04
- [PULL 02/16] tests/docker: better handle symlinked libs, Alex Bennée, 2020/02/04
- [PULL 05/16] .travis.yml: Drop superfluous use of --python=python3 parameter, Alex Bennée, 2020/02/04
- [PULL 07/16] .travis.yml: build documents under bionic, Alex Bennée, 2020/02/04
- [PULL 06/16] .travis.yml: Add description to each job, Alex Bennée, 2020/02/04
- [PULL 11/16] tests/tcg: gate pauth-% tests on having compiler support,
Alex Bennée <=
- [PULL 12/16] .travis.yml: introduce TEST_BUILD_CMD and use it for check-tcg, Alex Bennée, 2020/02/04
- [PULL 10/16] tests/tcg: add a configure compiler check for ARMv8.1 and SVE, Alex Bennée, 2020/02/04
- [PULL 08/16] .travis.yml: move cache flushing to early common phase, Alex Bennée, 2020/02/04
- [PULL 09/16] .travis.yml: probe for number of available processors, Alex Bennée, 2020/02/04
- [PULL 14/16] .travis.yml: drop cris-linux-user from the plugins test, Alex Bennée, 2020/02/04
- [PULL 15/16] .travis.yml: single thread build-tcg, Alex Bennée, 2020/02/04
- [PULL 13/16] .travis.yml: drop the travis_retry from tests, Alex Bennée, 2020/02/04
- [PULL 16/16] .travis.yml: ensure python3-sphinx installed for docs, Alex Bennée, 2020/02/04
- Re: [PULL 00/16] testing updates, Peter Maydell, 2020/02/06