travis googlemock as well

10 years ago · df688319de
parent 12a8c19167
commit df688319de
2 changed files with 11 additions and 7 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -29,6 +29,7 @@ addons:
    - valgrind
 os:
  - linux
+  - osx
 language: cpp
 compiler:
  - gcc
--- 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