diff --git a/.travis.yml b/.travis.yml index f4272f4f..f8a49b09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,96 +6,96 @@ matrix: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.4'] - env: SCRIPT=cmake _CC=gcc-4.4 _CXX=g++-4.4 + env: SCRIPT=test _CC=gcc-4.4 _CXX=g++-4.4 - addons: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.6'] - env: SCRIPT=cmake _CC=gcc-4.6 _CXX=g++-4.6 + env: SCRIPT=test _CC=gcc-4.6 _CXX=g++-4.6 - addons: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.7'] - env: SCRIPT=cmake _CC=gcc-4.7 _CXX=g++-4.7 + env: SCRIPT=test _CC=gcc-4.7 _CXX=g++-4.7 - addons: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.8'] - env: SCRIPT=cmake _CC=gcc-4.8 _CXX=g++-4.8 SANITIZE=address + env: SCRIPT=test _CC=gcc-4.8 _CXX=g++-4.8 SANITIZE=address - addons: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.9'] - env: SCRIPT=cmake _CC=gcc-4.9 _CXX=g++-4.9 SANITIZE=leak + env: SCRIPT=test _CC=gcc-4.9 _CXX=g++-4.9 SANITIZE=leak - addons: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-5'] - env: SCRIPT=cmake _CC=gcc-5 _CXX=g++-5 # SANITIZE=undefined + env: SCRIPT=test _CC=gcc-5 _CXX=g++-5 # SANITIZE=undefined - addons: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-6'] - env: SCRIPT=cmake _CC=gcc-6 _CXX=g++-6 + env: SCRIPT=test _CC=gcc-6 _CXX=g++-6 - addons: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-7'] - env: SCRIPT=cmake _CC=gcc-7 _CXX=g++-7 - - env: SCRIPT=cmake _CC=clang _CXX=clang++ + env: SCRIPT=test _CC=gcc-7 _CXX=g++-7 + - env: SCRIPT=test _CC=clang _CXX=clang++ - addons: apt: sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5'] packages: ['clang-3.5'] - env: SCRIPT=cmake _CC=clang-3.5 _CXX=clang++-3.5 SANITIZE=address + env: SCRIPT=test _CC=clang-3.5 _CXX=clang++-3.5 SANITIZE=address - addons: apt: sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.6'] packages: ['clang-3.6'] - env: SCRIPT=cmake _CC=clang-3.6 _CXX=clang++-3.6 SANITIZE=leak + env: SCRIPT=test _CC=clang-3.6 _CXX=clang++-3.6 SANITIZE=leak - addons: apt: sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.7'] packages: ['clang-3.7'] - env: SCRIPT=cmake _CC=clang-3.7 _CXX=clang++-3.7 + env: SCRIPT=test _CC=clang-3.7 _CXX=clang++-3.7 - addons: apt: sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.8'] packages: ['clang-3.8'] - env: SCRIPT=cmake _CC=clang-3.8 _CXX=clang++-3.8 SANITIZE=undefined + env: SCRIPT=test _CC=clang-3.8 _CXX=clang++-3.8 SANITIZE=undefined - addons: apt: sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-3.9'] packages: ['clang-3.9'] - env: SCRIPT=cmake _CC=clang-3.9 _CXX=clang++-3.9 + env: SCRIPT=test _CC=clang-3.9 _CXX=clang++-3.9 - addons: apt: sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-4.0'] packages: ['clang-4.0'] - env: SCRIPT=cmake _CC=clang-4.0 _CXX=clang++-4.0 + env: SCRIPT=test _CC=clang-4.0 _CXX=clang++-4.0 - addons: apt: sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-5.0'] packages: ['clang-5.0'] - env: SCRIPT=cmake _CC=clang-5.0 _CXX=clang++-5.0 + env: SCRIPT=test _CC=clang-5.0 _CXX=clang++-5.0 - addons: apt: sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-6.0'] packages: ['clang-6.0'] - env: SCRIPT=cmake _CC=clang-6.0 _CXX=clang++-6.0 + env: SCRIPT=test _CC=clang-6.0 _CXX=clang++-6.0 - env: SCRIPT=coverage - os: osx osx_image: xcode7.3 - env: SCRIPT=cmake + env: SCRIPT=test - os: osx osx_image: xcode8.3 - env: SCRIPT=cmake + env: SCRIPT=test - os: osx osx_image: xcode9.4 - env: SCRIPT=cmake + env: SCRIPT=test - os: osx osx_image: xcode10 - env: SCRIPT=cmake SANITIZE=address + env: SCRIPT=test SANITIZE=address - env: SCRIPT=arduino VERSION=1.6.7 BOARD=arduino:avr:uno - env: SCRIPT=arduino VERSION=1.8.2 BOARD=arduino:samd:mkr1000 - env: SCRIPT=platformio BOARD=uno diff --git a/scripts/travis/cmake.sh b/scripts/travis/build.sh similarity index 88% rename from scripts/travis/cmake.sh rename to scripts/travis/build.sh index da1f0662..34547bee 100755 --- a/scripts/travis/cmake.sh +++ b/scripts/travis/build.sh @@ -12,4 +12,3 @@ fi cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . cmake --build . -ctest --output-on-failure . diff --git a/scripts/travis/test.sh b/scripts/travis/test.sh new file mode 100755 index 00000000..031f3eed --- /dev/null +++ b/scripts/travis/test.sh @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +"$(dirname "$0")/build.sh" +ctest --output-on-failure .