diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-05-01 17:07:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 17:07:29 (GMT) |
| commit | 278aba369c41e90e9e77a6f51443beb3692919cf (patch) | |
| tree | 1054445a8c6c4b7b7171eb447590c356962e018d | |
| parent | dc043e1ca6bd509a92452ed54e817b6979869372 (diff) | |
| parent | 95ec42d95f051633a934f105e52d693aa9ae9d3a (diff) | |
| download | googletest-278aba369c41e90e9e77a6f51443beb3692919cf.zip googletest-278aba369c41e90e9e77a6f51443beb3692919cf.tar.gz googletest-278aba369c41e90e9e77a6f51443beb3692919cf.tar.bz2 | |
Merge pull request #1589 from sgraham/rtti-build
Add no-exception and no-rtti to build matrix
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | ci/travis.sh | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index aa91439..1200c67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,9 @@ matrix: group: deprecated-2017Q4 compiler: clang env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 + - 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 env: BUILD_TYPE=Debug VERBOSE=1 diff --git a/ci/travis.sh b/ci/travis.sh index 2dda68f..9ff3bad 100755 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -24,11 +24,19 @@ export MAKEFLAGS env | sort +# Set default values to OFF for these variables if not specified. +: "${NO_EXCEPTION:=OFF}" +: "${NO_RTTI:=OFF}" +: "${COMPILER_IS_GNUCXX:=OFF}" + mkdir build || true 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 \ .. |