summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorArthur O'Dwyer <arthur.j.odwyer@gmail.com>2020-03-28 12:41:59 -0400
committerArthur O'Dwyer <arthur.j.odwyer@gmail.com>2020-03-28 13:06:55 -0400
commit5504ded3ab5cdc0adcacd8ffe0d63587229e763d (patch)
tree21b4a58480baa0643fe5a747408c5d2f8eb93989 /ci
parent67cc66080d64e3fa5124fe57ed0cf15e2cecfdeb (diff)
downloadgoogletest-git-5504ded3ab5cdc0adcacd8ffe0d63587229e763d.tar.gz
Fix a typo in .travis.yml
The old code was trying to pass -Wgnu-zero-variadic-macro-arguments as part of CXXFLAGS, but it forgot the quotation marks needed around whitespace. This meant that option was ignored: https://travis-ci.org/github/google/googletest/jobs/666534177#L760 Unfortunately, the codebase is not remotely clean with respect to that warning option. It fails like this: https://travis-ci.org/github/Quuxplusone/googletest/jobs/668118135 So, remove that failing configuration from the test matrix until someone has time to look at it.
Diffstat (limited to 'ci')
-rwxr-xr-xci/travis.sh10
1 files changed, 5 insertions, 5 deletions
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