eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 5504ded3ab5cdc0adcacd8ffe0d63587229e763d into 67cc66080d64e3fa5124fe57ed0cf15e2cecfdeb

Browse Source
This commit is contained in:
Arthur O'Dwyer 2020-03-28 10:32:27 -07:00 committed by GitHub
commit 71d48d40df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -26,9 +26,6 @@ matrix:
- os: linux
compiler: gcc
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

10
ci/travis.sh
View File

@ -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