travis googlemock as well

.travis.yml

@@ -29,6 +29,7 @@ addons:
     - valgrind
 os:
   - linux
+  - osx
 language: cpp
 compiler:
   - gcc

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.
+mkdir build/googletest
-#  https://github.com/travis-ci/travis-ci/issues/2320
+( cd build/googletest && cmake ../../googletest )
 if [ "$TRAVIS_OS_NAME" != "osx" ]
 then
-  make
+( cd build/googletest && make )
-  # valgrind --error-exitcode=42 --leak-check=full ./src/test_lib_json/jsoncpp_test
+fi
+
+mkdir build/googlemock
+( cd build/googlemock && cmake ../../googlemock )
+if [ "$TRAVIS_OS_NAME" != "osx" ]
+then
+  ( cd build/googlemock && make )
 fi