travis update

This commit is contained in:
Billy Donahue 2015-08-31 09:54:37 -04:00
parent b1b7bd3c08
commit 520d30c035

View File

@ -13,22 +13,17 @@
# -e: fail on error # -e: fail on error
# -v: show commands # -v: show commands
# -x: show expanded commands # -x: show expanded commands
set -vex set -evx
env | sort env | sort
mkdir build mkdir build
mkdir build/googletest ( mkdir build/googletest &&
( cd build/googletest && cmake ../../googletest ) cd build/googletest &&
if [ "$TRAVIS_OS_NAME" != "osx" ] cmake ../../googletest &&
then make)
( cd build/googletest && make ) ( mkdir build/googlemock &&
fi cd build/googlemock &&
cmake ../../googlemock &&
mkdir build/googlemock make)
( cd build/googlemock && cmake ../../googlemock )
if [ "$TRAVIS_OS_NAME" != "osx" ]
then
( cd build/googlemock && make )
fi