From bd156a210d347a073a6939cc4adab3d9256c2e2b Mon Sep 17 00:00:00 2001
From: RuQing Xu <r-xu@g.ecc.u-tokyo.ac.jp>
Date: Sun, 16 May 2021 02:56:14 +0900
Subject: [PATCH] Adjust TravisCI

- ArmSVE don't test gemmt (seems Qemu-only problem);
- Clang use TravisCI-provided version instead of fixing to clang-8
  due to that clang-8 seems conflicting with TravisCI's clang-7.
---
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b0d10749f..3a1a6f50b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,13 +41,14 @@ matrix:
   # clang build
   - os: linux
     compiler: clang
-    env: OOT=0 TEST=0 SDE=0 THR="none" CONF="auto" \
-      PACKAGES="clang-8 binutils"
+    env: OOT=0 TEST=0 SDE=0 THR="none" CONF="auto"
+      # There seems to be some difficulty installing 2 Clang toolchains of different versions.
+      # Use the TravisCI default.
+      # PACKAGES="clang-8 binutils"
   # macOS with system compiler (clang)
   - os: osx
     compiler: clang
-    env: OOT=0 TEST=1 SDE=0 THR="none" CONF="auto" \
-      PACKAGES="clang-8 binutils"
+    env: OOT=0 TEST=1 SDE=0 THR="none" CONF="auto"
   # cortexa15 build and fast testsuite (qemu)
   - os: linux
     compiler: arm-linux-gnueabihf-gcc
@@ -67,9 +68,8 @@ matrix:
       PACKAGES="gcc-10-aarch64-linux-gnu libc6-dev-arm64-cross qemu-system-arm qemu-user" \
       TESTSUITE_WRAPPER="qemu-aarch64 -cpu max,sve=true,sve512=true -L /usr/aarch64-linux-gnu/"
 install:
-- if [ "$CC" = "clang" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CC="clang-8"; fi
-- if [ "$CC" = "gcc"   ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CC="gcc-8"  ; fi
-- if [ -n "$PACKAGES" ]; then sudo apt-get install -y $PACKAGES; fi
+- if [ "$CC" = "gcc"  ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CC="gcc-8"; fi
+- if [ -n "$PACKAGES" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install -y $PACKAGES; fi
 script:
 - export DIST_PATH=.
 - if [ $OOT -eq 1 ]; then export DIST_PATH=`pwd`; mkdir ../oot; cd ../oot; chmod -R a-w $DIST_PATH; fi
@@ -79,5 +79,7 @@ script:
 - env
 - ls -l
 - make -j 2 V=1
+# Qemu SVE is failing sgemmt in some cases. Skip as this issue is not observed on real chip (A64fx).
+- if [ "$CONF" = "armsve" ]; then sed -i 's/.*\<gemmt\>.*/0/' $DIST_PATH/testsuite/input.operations.fast; fi
 - if [ "$TEST" != "0" ]; then travis_wait 30 $DIST_PATH/travis/do_testsuite.sh; fi
 - if [ "$SDE" = "1" ]; then travis_wait 30 $DIST_PATH/travis/do_sde.sh; fi