summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorAnthony Green <green@moxielogic.com>2018-03-29 07:22:38 -0400
committerAnthony Green <green@moxielogic.com>2018-03-29 07:22:38 -0400
commitf98e0f0d777bf962057e18d036989b2b89fdf416 (patch)
treefe40ae3f4a95f8d04d743bc6cde424dc526246ac /.travis.yml
parentfa72b054e10acaea33ec8cc395e0ea5b31c9ac9e (diff)
downloadlibffi-f98e0f0d777bf962057e18d036989b2b89fdf416.tar.gz
Simplify matrix
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml18
1 files changed, 10 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 2822998..b6e5cb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,14 +3,6 @@ sudo: required
language: cpp
-os:
- - linux
-compiler:
- - gcc
- - clang
-env:
- - CONFIGURE_OPTIONS=--disable-shared
- - CONFIGURE_OPTIONS=
matrix:
include:
- os: osx
@@ -19,6 +11,16 @@ matrix:
compiler: gcc
env: HOST=i386-pc-linux-gnu MEVAL='export CC="$CC -m32" && CXX="$CXX -m32"'
- os: linux
+ compiler: gcc
+ - os: linux
+ compiler: gcc
+ env: CONFIGURE_OPTIONS=--disable-shared
+ - os: linux
+ compiler: clang
+ - os: linux
+ compiler: clang
+ env: CONFIGURE_OPTIONS=--disable-shared
+ - os: linux
env: HOST=moxie-elf MEVAL='export PATH=/opt/moxielogic/bin:$PATH && CC=moxie-elf-gcc && CXX=moxie-elf-g++' LDFLAGS=-Tsim.ld RUNTESTFLAGS="--target_board moxie-sim" DEJAGNU="$TRAVIS_BUILD_DIR/.travis/site.exp"
before_install: