break out test and mock in travis

fefba42a · Billy Donahue · a48c4e5e · fefba42a · fefba42a
Commit fefba42a authored Aug 31, 2015 by Billy Donahue
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

.travis.yml .travis.yml +4 -2

travis.sh travis.sh +5 -7

No files found.
--- 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
+    - GTEST_TARGET=googletest 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=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
--- a/travis.sh
+++ b/travis.sh
 #!/usr/bin/env sh
 set -evx
 env | sort
+t = $GTEST_TARGET
 mkdir build
-for d in googletest googlemock
+mkdir build/$t
-do
+cd build/$t
-  ( mkdir build/$d &&
+cmake ../../$t
-    cd build/$d &&
+make
-    cmake ../../$d &&
-    make)
-done