All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, "Peter Maydell" <peter.maydell@linaro.org>,
	berrange@redhat.com, stefanb@linux.vnet.ibm.com,
	"Alex Bennée" <alex.bennee@linaro.org>,
	richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org,
	stefanha@redhat.com, marcandre.lureau@redhat.com,
	pbonzini@redhat.com,
	"open list:ARM TCG CPUs" <qemu-arm@nongnu.org>,
	aurelien@aurel32.net
Subject: [PATCH v3 13/17] tests/tcg: gate pauth-% tests on having compiler support
Date: Mon,  3 Feb 2020 09:09:28 +0000	[thread overview]
Message-ID: <20200203090932.19147-14-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200203090932.19147-1-alex.bennee@linaro.org>

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>
---
 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



  parent reply	other threads:[~2020-02-03  9:17 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-03  9:09 [PATCH v3 00/17] testing/next (with build fixes, finally GREEN!) Alex Bennée
2020-02-03  9:09 ` [PATCH v3 01/17] tests/docker: move most cross compilers to buster base Alex Bennée
2020-02-03  9:09 ` [PATCH v3 02/17] tests/docker: better handle symlinked libs Alex Bennée
2020-02-03  9:09 ` [PATCH v3 03/17] gitlab-ci: Refresh the list of iotests Alex Bennée
2020-02-03  9:09 ` [PATCH v3 04/17] travis.yml: Install genisoimage package Alex Bennée
2020-02-03  9:09 ` [PATCH v3 05/17] .shippable: --disable-docs for cross-compile tests Alex Bennée
2020-02-03  9:09 ` [PATCH v3 06/17] hw/hppa/Kconfig: LASI chipset requires PARALLEL port Alex Bennée
2020-02-03  9:09 ` [PATCH v3 07/17] .travis.yml: Drop superfluous use of --python=python3 parameter Alex Bennée
2020-02-03  9:09 ` [PATCH v3 08/17] .travis.yml: Add description to each job Alex Bennée
2020-02-03  9:09 ` [PATCH v3 09/17] .travis.yml: build documents under bionic Alex Bennée
2020-02-03  9:09 ` [PATCH v3 10/17] .travis.yml: move cache flushing to early common phase Alex Bennée
2020-02-03  9:09 ` [PATCH v3 11/17] .travis.yml: probe for number of available processors Alex Bennée
2020-02-03  9:09 ` [PATCH v3 12/17] tests/tcg: add a configure compiler check for ARMv8.1 and SVE Alex Bennée
2020-02-03  9:09 ` Alex Bennée [this message]
2020-02-03  9:09 ` [PATCH v3 14/17] .travis.yml: introduce TEST_BUILD_CMD and use it for check-tcg Alex Bennée
2020-02-03 15:00   ` Philippe Mathieu-Daudé
2020-02-03  9:09 ` [PATCH v3 15/17] .travis.yml: drop the travis_retry from tests Alex Bennée
2020-02-03 14:58   ` Philippe Mathieu-Daudé
2020-02-03  9:09 ` [PATCH v3 16/17] .travis.yml: drop cris-linux-user from the plugins test Alex Bennée
2020-02-03  9:09 ` [PATCH v3 17/17] .travis.yml: single thread build-tcg Alex Bennée
2020-02-03 10:01   ` Thomas Huth
2020-02-03 11:35     ` Philippe Mathieu-Daudé
2020-02-03 14:37       ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200203090932.19147-14-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=cota@braap.org \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=stefanb@linux.vnet.ibm.com \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.