diff options
| author | Billy Donahue <billydonahue@google.com> | 2015-08-31 10:29:11 -0400 |
|---|---|---|
| committer | Billy Donahue <billydonahue@google.com> | 2015-08-31 10:29:11 -0400 |
| commit | fefba42a05d56612b173a99db9689617751fe9f6 (patch) | |
| tree | 1a9902e9d71ce1eaeffeda8f0f1deb4885548c25 | |
| parent | a48c4e5e36be3ef2911409d38a41d002c4800360 (diff) | |
| download | googletest-fefba42a05d56612b173a99db9689617751fe9f6.tar.gz googletest-fefba42a05d56612b173a99db9689617751fe9f6.tar.bz2 googletest-fefba42a05d56612b173a99db9689617751fe9f6.zip | |
break out test and mock in travis
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | travis.sh | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 9d6df7e9..cb1ab4bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,10 @@ compiler: script: ./travis.sh env: matrix: - - SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false - - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE + - GTEST_TARGET=googletest SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false + - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE + - GTEST_TARGET=googlemock SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false + - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE notifications: email: false sudo: false @@ -1,11 +1,9 @@ #!/usr/bin/env sh set -evx env | sort +t = $GTEST_TARGET mkdir build -for d in googletest googlemock -do - ( mkdir build/$d && - cd build/$d && - cmake ../../$d && - make) -done +mkdir build/$t +cd build/$t +cmake ../../$t +make |