diff options
| author | Mark Barolak <mbar@google.com> | 2020-04-16 13:32:24 -0400 |
|---|---|---|
| committer | Mark Barolak <mbar@google.com> | 2020-04-16 13:32:24 -0400 |
| commit | c2032090f37326bf9aa58b2b00c20faa6c648c16 (patch) | |
| tree | e9522d403d5464b072419af5e7e07e9b667dba7d | |
| parent | b51a49e0cb82064b09a38a2226c72c6f90f27d31 (diff) | |
| parent | 5504ded3ab5cdc0adcacd8ffe0d63587229e763d (diff) | |
| download | googletest-c2032090f37326bf9aa58b2b00c20faa6c648c16.tar.gz googletest-c2032090f37326bf9aa58b2b00c20faa6c648c16.tar.bz2 googletest-c2032090f37326bf9aa58b2b00c20faa6c648c16.zip | |
Merge pull request #2772 from Quuxplusone:travis
PiperOrigin-RevId: 305747317
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | ci/travis.sh | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 04b51dde..27c725c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,6 @@ matrix: env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 - os: linux compiler: clang - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 -Wgnu-zero-variadic-macro-arguments - - os: linux - compiler: clang env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON - os: osx compiler: gcc diff --git a/ci/travis.sh b/ci/travis.sh index 9ff3bad3..f37660bb 100755 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -34,11 +34,11 @@ cd build cmake -Dgtest_build_samples=ON \ -Dgtest_build_tests=ON \ -Dgmock_build_tests=ON \ - -Dcxx_no_exception=$NO_EXCEPTION \ - -Dcxx_no_rtti=$NO_RTTI \ - -DCMAKE_COMPILER_IS_GNUCXX=$COMPILER_IS_GNUCXX \ - -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ - -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ + -Dcxx_no_exception="$NO_EXCEPTION" \ + -Dcxx_no_rtti="$NO_RTTI" \ + -DCMAKE_COMPILER_IS_GNUCXX="$COMPILER_IS_GNUCXX" \ + -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \ + -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \ .. make CTEST_OUTPUT_ON_FAILURE=1 make test |