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] 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