aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKito Cheng <kito.cheng@sifive.com>2019-10-03 10:13:41 +0800
committerKito Cheng <kito.cheng@sifive.com>2019-10-03 10:18:02 +0800
commit743893e4e776c79432737ff43c96085b54266420 (patch)
tree2d5e64ff85ef76182160bbcba7885f614e0b4e64
parentd5bea51083ec38172b84b7cd5ee99bfcb8d2e7b0 (diff)
downloadriscv-gnu-toolchain-743893e4e776c79432737ff43c96085b54266420.zip
riscv-gnu-toolchain-743893e4e776c79432737ff43c96085b54266420.tar.gz
riscv-gnu-toolchain-743893e4e776c79432737ff43c96085b54266420.tar.bz2
Add macos to travis-ci
-rw-r--r--.travis.yml117
-rwxr-xr-xscripts/wrapper/make_stderr_tail6
2 files changed, 74 insertions, 49 deletions
diff --git a/.travis.yml b/.travis.yml
index 13b857a..f0c7611 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,54 +1,73 @@
sudo: false
-addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- packages:
- - autoconf
- - automake
- - autotools-dev
- - bc
- - bison
- - build-essential
- - curl
- - dejagnu
- - expect
- - flex
- - gawk
- - gperf
- - libgmp-dev
- - libmpc-dev
- - libmpfr-dev
- - libtool
- - patchutils
- - texinfo
- - gcc-6
- - g++-6
-before_install:
- - export MAKEFLAGS="-j3"
- - export CXX=g++-6
- - export CC=gcc-6
- - travis_wait 60 git submodule update --init --recursive
-env:
-# - CARGS="--enable-linux --disable-multilib --with-arch=rv32imac --with-abi=ilp32"
-# - CARGS="--enable-linux --disable-multilib --with-arch=rv32imafdc --with-abi=ilp32"
-# - CARGS="--enable-linux --disable-multilib --with-arch=rv32imafdc --with-abi=ilp32d"
-# - CARGS="--enable-linux --disable-multilib --with-arch=rv64imac --with-abi=lp64"
-# - CARGS="--enable-linux --disable-multilib --with-arch=rv64imafdc --with-abi=lp64"
-# - CARGS="--enable-linux --disable-multilib --with-arch=rv64imafdc --with-abi=lp64d"
- - CARGS="--disable-linux --disable-multilib --with-arch=rv32i --with-abi=ilp32"
- - CARGS="--disable-linux --disable-multilib --with-arch=rv32im --with-abi=ilp32"
- - CARGS="--disable-linux --disable-multilib --with-arch=rv32iac --with-abi=ilp32"
- - CARGS="--disable-linux --disable-multilib --with-arch=rv32imac --with-abi=ilp32"
- - CARGS="--disable-linux --disable-multilib --with-arch=rv32imafc --with-abi=ilp32f"
- - CARGS="--disable-linux --disable-multilib --with-arch=rv64imac --with-abi=lp64"
- - CARGS="--disable-linux --disable-multilib --with-arch=rv64imafdc --with-abi=lp64d"
+matrix:
+ include:
+ - os: osx
+ before_install:
+ - brew update
+ - brew install zlib expat gawk gnu-sed
+ - export MAKEFLAGS="-j3"
+ - travis_wait 60 git submodule update --init --recursive
+ env:
+ - CARGS="--disable-linux --disable-multilib --with-arch=rv32imafdc --with-abi=ilp32d"
+ script:
+ # MacOS don't support linux user mode for qemu, so there is only build
+ # testing.
+ - ./configure --prefix=/tmp/build-default $CARGS
+ # MacOS using clang by default, it will generate lots of warning message,
+ # pipe stderr to stdout to prevent exceeded the maximum log length.
+ - travis_wait 90 scripts/wrapper/make_stderr_tail
+ - os: linux
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - autoconf
+ - automake
+ - autotools-dev
+ - bc
+ - bison
+ - build-essential
+ - curl
+ - dejagnu
+ - expect
+ - flex
+ - gawk
+ - gperf
+ - libgmp-dev
+ - libmpc-dev
+ - libmpfr-dev
+ - libtool
+ - patchutils
+ - texinfo
+ - gcc-6
+ - g++-6
+ before_install:
+ - export MAKEFLAGS="-j3"
+ - export CXX=g++-6
+ - export CC=gcc-6
+ - travis_wait 60 git submodule update --init --recursive
+ env:
+ # - CARGS="--enable-linux --disable-multilib --with-arch=rv32imac --with-abi=ilp32"
+ # - CARGS="--enable-linux --disable-multilib --with-arch=rv32imafdc --with-abi=ilp32"
+ # - CARGS="--enable-linux --disable-multilib --with-arch=rv32imafdc --with-abi=ilp32d"
+ # - CARGS="--enable-linux --disable-multilib --with-arch=rv64imac --with-abi=lp64"
+ # - CARGS="--enable-linux --disable-multilib --with-arch=rv64imafdc --with-abi=lp64"
+ # - CARGS="--enable-linux --disable-multilib --with-arch=rv64imafdc --with-abi=lp64d"
+ - CARGS="--disable-linux --disable-multilib --with-arch=rv32i --with-abi=ilp32"
+ - CARGS="--disable-linux --disable-multilib --with-arch=rv32im --with-abi=ilp32"
+ - CARGS="--disable-linux --disable-multilib --with-arch=rv32iac --with-abi=ilp32"
+ - CARGS="--disable-linux --disable-multilib --with-arch=rv32imac --with-abi=ilp32"
+ - CARGS="--disable-linux --disable-multilib --with-arch=rv32imafc --with-abi=ilp32f"
+ - CARGS="--disable-linux --disable-multilib --with-arch=rv64imac --with-abi=lp64"
+ - CARGS="--disable-linux --disable-multilib --with-arch=rv64imafdc --with-abi=lp64d"
+ script:
+ - ./configure --prefix=/tmp/build-default $CARGS
+ - travis_wait 90 scripts/wrapper/make_tail
+ - travis_wait 180 scripts/wrapper/make_tail check
+ - make report
+
install: true
-script:
- - ./configure --prefix=/tmp/build-default $CARGS
- - travis_wait 90 scripts/wrapper/make_tail
- - travis_wait 180 scripts/wrapper/make_tail check
- - make report
git:
submodules: false
diff --git a/scripts/wrapper/make_stderr_tail b/scripts/wrapper/make_stderr_tail
new file mode 100755
index 0000000..6d0e8de
--- /dev/null
+++ b/scripts/wrapper/make_stderr_tail
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -o pipefail
+set -e
+
+make "$@" 2>&1 | tail