From e5c7bbae181e3351c8be26c52a9fa19c238aa4e8 Mon Sep 17 00:00:00 2001
From: Billy Donahue <billydonahue@google.com>
Date: Mon, 31 Aug 2015 10:08:44 -0400
Subject: [PATCH 1/5] remove unused valgrind probe

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9ae5cb2a..9d6df7e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@ install:
 - export PATH=/usr/local/bin:/usr/bin:${PATH}
 - echo ${CXX}
 - ${CXX} --version
-- which valgrind
 addons:
   apt:
     sources:

From a48c4e5e36be3ef2911409d38a41d002c4800360 Mon Sep 17 00:00:00 2001
From: Billy Donahue <billydonahue@google.com>
Date: Mon, 31 Aug 2015 10:21:58 -0400
Subject: [PATCH 2/5] cleanup travis.sh

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

diff --git a/travis.sh b/travis.sh
index d7656999..fac58550 100755
--- a/travis.sh
+++ b/travis.sh
@@ -1,29 +1,11 @@
 #!/usr/bin/env sh
-# This is called by `.travis.yml` via Travis CI.
-# Travis supplies $TRAVIS_OS_NAME.
-#  http://docs.travis-ci.com/user/multi-os/
-# Our .travis.yml also defines:
-#   - SHARED_LIB=ON/OFF
-#   - STATIC_LIB=ON/OFF
-#   - CMAKE_PKG=ON/OFF
-#   - BUILD_TYPE=release/debug
-#   - VERBOSE_MAKE=false/true
-#   - VERBOSE (set or not)
-
-# -e: fail on error
-# -v: show commands
-# -x: show expanded commands
 set -evx
-
 env | sort
-
 mkdir build
-
-( mkdir build/googletest &&
-  cd build/googletest &&
-  cmake ../../googletest &&
-  make)
-( mkdir build/googlemock &&
-  cd build/googlemock &&
-  cmake ../../googlemock &&
-  make)
+for d in googletest googlemock
+do
+  ( mkdir build/$d &&
+    cd build/$d &&
+    cmake ../../$d &&
+    make)
+done

From fefba42a05d56612b173a99db9689617751fe9f6 Mon Sep 17 00:00:00 2001
From: Billy Donahue <billydonahue@google.com>
Date: Mon, 31 Aug 2015 10:29:11 -0400
Subject: [PATCH 3/5] break out test and mock in travis

---
 .travis.yml |  6 ++++--
 travis.sh   | 12 +++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9d6df7e9..cb1ab4bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,8 +36,10 @@ compiler:
 script: ./travis.sh
 env:
   matrix:
-    - 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
+    - GTEST_TARGET=googletest SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
+    - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
+    - GTEST_TARGET=googlemock SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
+    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
 notifications:
   email: false
 sudo: false
diff --git a/travis.sh b/travis.sh
index fac58550..8d10dcbe 100755
--- a/travis.sh
+++ b/travis.sh
@@ -1,11 +1,9 @@
 #!/usr/bin/env sh
 set -evx
 env | sort
+t = $GTEST_TARGET
 mkdir build
-for d in googletest googlemock
-do
-  ( mkdir build/$d &&
-    cd build/$d &&
-    cmake ../../$d &&
-    make)
-done
+mkdir build/$t
+cd build/$t
+cmake ../../$t
+make

From 897fa8e964471e87745cee0c74421215c95dd5d5 Mon Sep 17 00:00:00 2001
From: Billy Donahue <billydonahue@google.com>
Date: Mon, 31 Aug 2015 10:31:08 -0400
Subject: [PATCH 4/5] break out test and mock in travis

---
 travis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis.sh b/travis.sh
index 8d10dcbe..fbd548c7 100755
--- a/travis.sh
+++ b/travis.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 set -evx
 env | sort
-t = $GTEST_TARGET
+t=$GTEST_TARGET
 mkdir build
 mkdir build/$t
 cd build/$t

From fb6f62d1079951d22c1ec6c0f8aae29238036a19 Mon Sep 17 00:00:00 2001
From: Billy Donahue <billydonahue@google.com>
Date: Tue, 1 Sep 2015 02:14:45 -0400
Subject: [PATCH 5/5] run tests in Travis CI

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

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)