From 7da88b279ab75561afbec2c265304751b6cefd90 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Wed, 9 Sep 2020 00:08:56 +0200
Subject: [PATCH] Test multiple architectures

Run several builds on each available architecture.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
---
 .travis.yml | 57 ++++++++++-------------------------------------------
 1 file changed, 10 insertions(+), 47 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c67c0cd33..a22622bab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,54 +3,17 @@ compiler: gcc
 sudo: false
 cache: ccache
 
-jobs:
-  include:
-    - name: basic checks and reference configurations
-      addons:
-        apt:
-          packages:
-          - gnutls-bin
-          - doxygen
-          - graphviz
-          - gcc-arm-none-eabi
-          - libnewlib-arm-none-eabi
-      language: python # Needed to get pip for Python 3
-      python: 3.5 # version from Ubuntu 16.04
-      install:
-        - pip install pylint==2.4.4
-      script:
-        - tests/scripts/all.sh -k 'check_*'
-        - tests/scripts/all.sh -k test_default_out_of_box
-        - tests/scripts/test-ref-configs.pl
-        - tests/scripts/all.sh -k build_arm_none_eabi_gcc_arm5vte build_arm_none_eabi_gcc_m0plus
+arch:
+  - amd64
+  - ppc64le
+  - s390x
+  - arm64
 
-    - name: full configuration
-      script:
-        - tests/scripts/all.sh -k test_full_cmake_gcc_asan
-
-    - name: check compilation guards
-      script:
-        - tests/scripts/all.sh -k 'test_depends_*' 'build_key_exchanges'
-
-    - name: macOS
-      os: osx
-      compiler: clang
-      script:
-        - tests/scripts/all.sh -k test_default_out_of_box
-
-    - name: Windows
-      os: windows
-      before_install:
-        - choco install python --version=3.5.4
-      env:
-        # Add the directory where the Choco package goes
-        - PATH=/c/Python35:/c/Python35/Scripts:$PATH
-      script:
-        - type python; python --version
-        - python scripts/generate_psa_constants.py
-        # Logs appear out of sequence on Windows. Give time to catch up.
-        - sleep 5
-        - scripts/windows_msbuild.bat v141 # Visual Studio 2017
+script:
+  - tests/scripts/all.sh -k test_default_out_of_box
+  - tests/scripts/all.sh -k test_build_opt
+  - tests/scripts/all.sh -k test_full_cmake_gcc_asan
+  - tests/scripts/all.sh -k test_m32_o1
 
 after_failure:
 - tests/scripts/travis-log-failure.sh