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.
This commit is contained in:
parent
67cc66080d
commit
5504ded3ab
|
@ -26,9 +26,6 @@ matrix:
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11
|
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
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON
|
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON
|
||||||
|
|
10
ci/travis.sh
10
ci/travis.sh
|
@ -34,11 +34,11 @@ cd build
|
||||||
cmake -Dgtest_build_samples=ON \
|
cmake -Dgtest_build_samples=ON \
|
||||||
-Dgtest_build_tests=ON \
|
-Dgtest_build_tests=ON \
|
||||||
-Dgmock_build_tests=ON \
|
-Dgmock_build_tests=ON \
|
||||||
-Dcxx_no_exception=$NO_EXCEPTION \
|
-Dcxx_no_exception="$NO_EXCEPTION" \
|
||||||
-Dcxx_no_rtti=$NO_RTTI \
|
-Dcxx_no_rtti="$NO_RTTI" \
|
||||||
-DCMAKE_COMPILER_IS_GNUCXX=$COMPILER_IS_GNUCXX \
|
-DCMAKE_COMPILER_IS_GNUCXX="$COMPILER_IS_GNUCXX" \
|
||||||
-DCMAKE_CXX_FLAGS=$CXX_FLAGS \
|
-DCMAKE_CXX_FLAGS="$CXX_FLAGS" \
|
||||||
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
|
-DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
|
||||||
..
|
..
|
||||||
make
|
make
|
||||||
CTEST_OUTPUT_ON_FAILURE=1 make test
|
CTEST_OUTPUT_ON_FAILURE=1 make test
|
||||||
|
|
Loading…
Reference in New Issue
Block a user