summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBilly Donahue <billydonahue@google.com>2015-09-01 06:14:45 (GMT)
committerBilly Donahue <billydonahue@google.com>2015-09-01 06:14:45 (GMT)
commitfb6f62d1079951d22c1ec6c0f8aae29238036a19 (patch)
tree2e2ccdc4355edb055cad0e1acfb61d82ab4d2db7
parent520d30c035cdb14f074240ba0ef8dc3a3ac4dfbb (diff)
downloadgoogletest-fb6f62d1079951d22c1ec6c0f8aae29238036a19.zip
googletest-fb6f62d1079951d22c1ec6c0f8aae29238036a19.tar.gz
googletest-fb6f62d1079951d22c1ec6c0f8aae29238036a19.tar.bz2
run tests in Travis CIrefs/pull/576/head
-rwxr-xr-xtravis.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/travis.sh b/travis.sh
index d765699..3e4d308 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)