summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorHerbert Thielen <thielen@hs-worms.de>2017-08-29 15:41:26 (GMT)
committerHerbert Thielen <thielen@hs-worms.de>2017-08-29 15:41:26 (GMT)
commitd33861dca6fac5482f0c82a413a2571172d16fac (patch)
tree1bff928f51ed3455d9a100d25078e3db51aaab54 /.travis.yml
parent4a451575895dc665db33cd940b47f38e804a291d (diff)
downloadgoogletest-d33861dca6fac5482f0c82a413a2571172d16fac.zip
googletest-d33861dca6fac5482f0c82a413a2571172d16fac.tar.gz
googletest-d33861dca6fac5482f0c82a413a2571172d16fac.tar.bz2
run combined build onlyrefs/pull/1232/head
There is no need for separate 'googlemock' and 'googletest' builds, as the 'googlemock' build includes 'googletest' and it's unit tests.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index a8c2740..c155e57 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