tests/tcg: gate pauth-% tests on having compiler support

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 <alex.bennee@linaro.org>
Message-Id: <20200203090932.19147-14-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2020-02-03 09:09:28 +00:00
parent ded663a226
commit bb516dfc5b
3 changed files with 15 additions and 3 deletions

View File

@ -61,7 +61,13 @@ run-memory-replay: memory-replay run-memory-record
$(QEMU_OPTS) memory, \ $(QEMU_OPTS) memory, \
"$< on $(TARGET_NAME)") "$< on $(TARGET_NAME)")
run-pauth-3: pauth-3 EXTRA_TESTS+=memory-record memory-replay
pauth-3: CFLAGS += -march=armv8.3-a
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

View File

@ -18,9 +18,11 @@ run-fcvt: fcvt
$(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref) $(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref)
# Pauth Tests # Pauth Tests
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),)
AARCH64_TESTS += pauth-1 pauth-2 pauth-4 AARCH64_TESTS += pauth-1 pauth-2 pauth-4
run-pauth-%: QEMU_OPTS += -cpu max run-pauth-%: QEMU_OPTS += -cpu max
pauth-%: CFLAGS += -march=armv8.3-a pauth-%: CFLAGS += -march=armv8.3-a
endif
# Semihosting smoke test for linux-user # Semihosting smoke test for linux-user
AARCH64_TESTS += semihosting AARCH64_TESTS += semihosting

View File

@ -227,6 +227,10 @@ for target in $target_list; do
-march=armv8.1-a+sve -o $TMPE $TMPC; then -march=armv8.1-a+sve -o $TMPE $TMPC; then
echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak
fi 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 esac