diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-29 19:30:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 19:30:18 -0400 |
| commit | 58fd184c7f7a16401bb78eaec9e00b6e0a9581e9 (patch) | |
| tree | 38e5fd46df897b7702e74ac8bd568f5248c2d7ff | |
| parent | 30c1e00afbc083618abd745362c41d41a5ac61d0 (diff) | |
| parent | c4126e0463a82e710cc1a9928eca77c396614ca1 (diff) | |
| download | googletest-58fd184c7f7a16401bb78eaec9e00b6e0a9581e9.tar.gz googletest-58fd184c7f7a16401bb78eaec9e00b6e0a9581e9.tar.bz2 googletest-58fd184c7f7a16401bb78eaec9e00b6e0a9581e9.zip | |
Merge branch 'master' into hethi/typo-xUnit
| -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 3204dfac..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_MAKE=true VERBOSE - - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE - - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug CXX_FLAGS=-std=c++11 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 + - 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 |