diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | travis.sh | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index cb1ab4bf..b4c0cb2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,10 +36,10 @@ compiler: script: ./travis.sh env: matrix: - - GTEST_TARGET=googletest SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE - - GTEST_TARGET=googlemock SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE + - GTEST_TARGET=googletest SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false + - GTEST_TARGET=googlemock SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false notifications: email: false sudo: false @@ -1,9 +1,14 @@ #!/usr/bin/env sh set -evx env | sort -t=$GTEST_TARGET -mkdir build -mkdir build/$t -cd build/$t -cmake ../../$t + +mkdir build || true +mkdir build/$GTEST_TARGET || true +cd build/$GTEST_TARGET +cmake -Dgtest_build_samples=ON \ + -Dgmock_build_samples=ON \ + -Dgtest_build_tests=ON \ + -Dgmock_build_tests=ON \ + ../../$GTEST_TARGET make +make test |