From 95ec42d95f051633a934f105e52d693aa9ae9d3a Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Fri, 27 Apr 2018 11:27:06 -0700 Subject: [PATCH] Add no-exception and no-rtti to build matrix --- .travis.yml | 3 +++ ci/travis.sh | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index aa914391..1200c676 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 2dda68fd..9ff3bad3 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 \ ..