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: restore test running

---
 travis.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'travis.sh')

diff --git a/travis.sh b/travis.sh
index d7656999..3e4d3087 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)
-- 
cgit v1.2.3