summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml20
1 files changed, 10 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index cd43772a89..bdb2cfd20d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,11 @@ matrix:
- os: linux
include:
- os: linux
- env: BUILDTYPE=Release JOBS=16 MASON_PLATFORM=android
+ env: BUILDTYPE=Release JOBS=16 MASON_PLATFORM=android TESTMUNK=yes
+ compiler: clang
+ - os: linux
+ env: BUILDTYPE=Debug JOBS=16 MASON_PLATFORM=android TESTMUNK=no
compiler: clang
-# - os: linux
-# env: BUILDTYPE=Debug JOBS=16 MASON_PLATFORM=android
-# compiler: clang
- os: linux
env: BUILDTYPE=Release JOBS=16
compiler: clang
@@ -22,12 +22,12 @@ matrix:
- os: linux
env: BUILDTYPE=Debug JOBS=8
compiler: gcc
-# - os: osx
-# env: BUILDTYPE=Release JOBS=8 MASON_PLATFORM=android
-# compiler: clang
-# - os: osx
-# env: BUILDTYPE=Debug JOBS=8 MASON_PLATFORM=android
-# compiler: clang
+ - os: osx
+ env: BUILDTYPE=Release JOBS=8 MASON_PLATFORM=android TESTMUNK=no
+ compiler: clang
+ - os: osx
+ env: BUILDTYPE=Debug JOBS=8 MASON_PLATFORM=android TESTMUNK=no
+ compiler: clang
- os: osx
env: BUILDTYPE=Release JOBS=8
compiler: clang