aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBilly Donahue <BillyDonahue@users.noreply.github.com>2015-09-01 02:50:47 -0400
committerBilly Donahue <BillyDonahue@users.noreply.github.com>2015-09-01 02:50:47 -0400
commitf570b27e15a4e921d59495622a82277a3e1e8f87 (patch)
tree50790d1b38643cfc32c212845cd612fcc843def8
parentd6b112ccfd26e35a1a6e6eab83d4bb49bca69b6f (diff)
parent4e8f8cc3e23605377e6f26e8531e28ac4d2c81d6 (diff)
downloadgoogletest-f570b27e15a4e921d59495622a82277a3e1e8f87.tar.gz
googletest-f570b27e15a4e921d59495622a82277a3e1e8f87.tar.bz2
googletest-f570b27e15a4e921d59495622a82277a3e1e8f87.zip
Merge pull request #578 from BillyDonahue/upstream_master
build once
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index b4c0cb2a..cd3485cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,8 +38,8 @@ 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=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
+# - 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