From fbb0b960163ac0d3ebc731e34db250c1a73255b8 Mon Sep 17 00:00:00 2001
From: Billy Donahue <billydonahue@google.com>
Date: Tue, 1 Sep 2015 02:24:48 -0400
Subject: [PATCH 1/2] restore test running
---
travis.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/travis.sh b/travis.sh
index d7656999b..3e4d3087b 100755
--- a/travis.sh
+++ b/travis.sh
@@ -17,13 +17,13 @@ set -evx
env | sort
-mkdir build
+mkdir build || true
-( mkdir build/googletest &&
+( ( mkdir build/googletest || true ) &&
cd build/googletest &&
- cmake ../../googletest &&
- make)
-( mkdir build/googlemock &&
+ cmake -Dgtest_build_tests=ON -Dgtest_build_samples=ON ../../googletest &&
+ make && make test)
+( ( mkdir build/googlemock || true ) &&
cd build/googlemock &&
- cmake ../../googlemock &&
- make)
+ cmake -Dgmock_build_tests=ON -Dgtest_build_samples=ON ../../googlemock &&
+ make && make test)
From 9986d43dd93e93d6e86c02b58df8a65c3c3cc096 Mon Sep 17 00:00:00 2001
From: Billy Donahue <billydonahue@google.com>
Date: Tue, 1 Sep 2015 02:29:21 -0400
Subject: [PATCH 2/2] reduce the ci matrix
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 9ae5cb2af..ae45cd4eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ compiler:
script: ./travis.sh
env:
matrix:
- - SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false
+# - 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_MAKE=true VERBOSE
notifications:
email: false