commit 6fc49050217137ffdfeff648cc0322e14757da8f
author Billy Donahue <billydonahue@google.com> Tue Sep 01 02:41:55 2015 -0400
committer Billy Donahue <billydonahue@google.com> Tue Sep 01 02:41:55 2015 -0400
tree 9b64ac65d9f9b9e2cf358f7f8ce8a384529e3482
parent 9986d43dd93e93d6e86c02b58df8a65c3c3cc096
parent 8be1b6b087a4c5ad42834a5a391a8e3cae7b4c6f

run tests

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index cb1ab4b..b4c0cb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,10 +36,10 @@
 script: ./travis.sh
 env:
   matrix:
-    - 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
+    - GTEST_TARGET=googletest SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
+    - GTEST_TARGET=googlemock SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
 notifications:
   email: false
 sudo: false

travis.sh

diff --git a/travis.sh b/travis.sh
index fbd548c..6d381e9 100755
--- a/travis.sh
+++ b/travis.sh
@@ -1,9 +1,14 @@
 #!/usr/bin/env sh
 set -evx
 env | sort
-t=$GTEST_TARGET
-mkdir build
-mkdir build/$t
-cd build/$t
-cmake ../../$t
+
+mkdir build || true
+mkdir build/$GTEST_TARGET || true
+cd build/$GTEST_TARGET
+cmake -Dgtest_build_samples=ON \
+      -Dgmock_build_samples=ON \
+      -Dgtest_build_tests=ON \
+      -Dgmock_build_tests=ON \
+      ../../$GTEST_TARGET
 make
+make test