diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-29 19:27:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 19:27:27 -0400 |
| commit | c4126e0463a82e710cc1a9928eca77c396614ca1 (patch) | |
| tree | 1bff928f51ed3455d9a100d25078e3db51aaab54 | |
| parent | 24ceb4f4f552bf24e7bee0e81d3f810db2418a59 (diff) | |
| parent | d33861dca6fac5482f0c82a413a2571172d16fac (diff) | |
| download | googletest-c4126e0463a82e710cc1a9928eca77c396614ca1.tar.gz googletest-c4126e0463a82e710cc1a9928eca77c396614ca1.tar.bz2 googletest-c4126e0463a82e710cc1a9928eca77c396614ca1.zip | |
Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs
reduce travis buildjobs by 4/12
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | travis.sh | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index a8c27409..c155e571 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,11 +36,8 @@ compiler: script: ./travis.sh env: matrix: - - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 - - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 - - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 CXX_FLAGS=-std=c++11 -# - 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 + - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 + - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 CXX_FLAGS=-std=c++11 notifications: email: false sudo: false @@ -3,13 +3,12 @@ set -evx env | sort mkdir build || true -mkdir build/$GTEST_TARGET || true -cd build/$GTEST_TARGET +cd build cmake -Dgtest_build_samples=ON \ -Dgmock_build_samples=ON \ -Dgtest_build_tests=ON \ -Dgmock_build_tests=ON \ -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ - ../../$GTEST_TARGET + .. make CTEST_OUTPUT_ON_FAILURE=1 make test |