diff options
| author | Billy Donahue <billydonahue@google.com> | 2015-08-31 13:54:37 (GMT) |
|---|---|---|
| committer | Billy Donahue <billydonahue@google.com> | 2015-08-31 13:54:37 (GMT) |
| commit | 520d30c035cdb14f074240ba0ef8dc3a3ac4dfbb (patch) | |
| tree | 6282464c48b6f7bd0533ca5c49c4db782aef9edc /travis.sh | |
| parent | b1b7bd3c08c83178b8e1264420bc10d55ff18f75 (diff) | |
| download | googletest-520d30c035cdb14f074240ba0ef8dc3a3ac4dfbb.zip googletest-520d30c035cdb14f074240ba0ef8dc3a3ac4dfbb.tar.gz googletest-520d30c035cdb14f074240ba0ef8dc3a3ac4dfbb.tar.bz2 | |
travis update
Diffstat (limited to 'travis.sh')
| -rwxr-xr-x | travis.sh | 23 |
1 files changed, 9 insertions, 14 deletions
@@ -13,22 +13,17 @@ # -e: fail on error # -v: show commands # -x: show expanded commands -set -vex +set -evx env | sort mkdir build -mkdir build/googletest -( cd build/googletest && cmake ../../googletest ) -if [ "$TRAVIS_OS_NAME" != "osx" ] -then -( cd build/googletest && make ) -fi - -mkdir build/googlemock -( cd build/googlemock && cmake ../../googlemock ) -if [ "$TRAVIS_OS_NAME" != "osx" ] -then - ( cd build/googlemock && make ) -fi +( mkdir build/googletest && + cd build/googletest && + cmake ../../googletest && + make) +( mkdir build/googlemock && + cd build/googlemock && + cmake ../../googlemock && + make) |