diff options
| author | Herbert Thielen <h-github@thielen-home.de> | 2017-08-30 08:43:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 08:43:54 (GMT) |
| commit | c780e0e2c4e6d04a47d80068528471a9405c1665 (patch) | |
| tree | e8f1d22a92effe5933ff733be0ede324ec20b673 /travis.sh | |
| parent | 8364718500dac72c141aa55dcb2483177356717d (diff) | |
| parent | 71e2858f32902ca736e2dc8d81b512a4dfa18b80 (diff) | |
| download | googletest-c780e0e2c4e6d04a47d80068528471a9405c1665.zip googletest-c780e0e2c4e6d04a47d80068528471a9405c1665.tar.gz googletest-c780e0e2c4e6d04a47d80068528471a9405c1665.tar.bz2 | |
Merge branch 'master' into hethi/travis-unused-cmake
Diffstat (limited to 'travis.sh')
| -rwxr-xr-x | travis.sh | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -3,12 +3,11 @@ set -evx env | sort mkdir build || true -mkdir build/$GTEST_TARGET || true -cd build/$GTEST_TARGET +cd build cmake -Dgtest_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 |