summaryrefslogtreecommitdiffstats
path: root/travis.sh
diff options
context:
space:
mode:
authorBilly Donahue <billydonahue@google.com>2015-08-31 03:19:21 -0400
committerBilly Donahue <billydonahue@google.com>2015-08-31 03:19:21 -0400
commitdf688319de08d8f4f084b00364f90cab7c54acaa (patch)
treecb62b72737a362e88f067eeea16594b0a3e26ed8 /travis.sh
parent12a8c19167d87502b59fdcbf4660a55fb20e2570 (diff)
downloadgoogletest-df688319de08d8f4f084b00364f90cab7c54acaa.tar.gz
googletest-df688319de08d8f4f084b00364f90cab7c54acaa.zip
travis googlemock as well
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh17
1 files changed, 10 insertions, 7 deletions
diff --git a/travis.sh b/travis.sh
index 71a003f7..ccaf3b5f 100755
--- a/travis.sh
+++ b/travis.sh
@@ -18,14 +18,17 @@ set -vex
env | sort
mkdir build
-cd build
-cmake ../googletest
-make
-# Python is not available in Travis for osx.
-# https://github.com/travis-ci/travis-ci/issues/2320
+mkdir build/googletest
+( cd build/googletest && cmake ../../googletest )
if [ "$TRAVIS_OS_NAME" != "osx" ]
then
- make
- # valgrind --error-exitcode=42 --leak-check=full ./src/test_lib_json/jsoncpp_test
+( cd build/googletest && make )
+fi
+
+mkdir build/googlemock
+( cd build/googlemock && cmake ../../googlemock )
+if [ "$TRAVIS_OS_NAME" != "osx" ]
+then
+ ( cd build/googlemock && make )
fi
OpenPOWER on IntegriCloud