diff options
| author | Billy Donahue <billydonahue@google.com> | 2015-08-31 03:19:21 -0400 |
|---|---|---|
| committer | Billy Donahue <billydonahue@google.com> | 2015-08-31 03:19:21 -0400 |
| commit | df688319de08d8f4f084b00364f90cab7c54acaa (patch) | |
| tree | cb62b72737a362e88f067eeea16594b0a3e26ed8 | |
| parent | 12a8c19167d87502b59fdcbf4660a55fb20e2570 (diff) | |
| download | googletest-df688319de08d8f4f084b00364f90cab7c54acaa.tar.gz googletest-df688319de08d8f4f084b00364f90cab7c54acaa.tar.bz2 googletest-df688319de08d8f4f084b00364f90cab7c54acaa.zip | |
travis googlemock as well
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | travis.sh | 17 |
2 files changed, 11 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 4957987f..9ae5cb2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ addons: - valgrind os: - linux + - osx language: cpp compiler: - gcc @@ -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 |