From eb8a1ef7aa43582202c8b385b9ee0665cc6c838c Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 15 Feb 2017 11:25:47 -0800 Subject: [tests] Disable timing-based Timer tests in CI --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0b6be78e56..f18629fa30 100644 --- a/Makefile +++ b/Makefile @@ -299,7 +299,6 @@ $(LINUX_BUILD): $(BUILD_DEPS) -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ -DWITH_COVERAGE=${WITH_COVERAGE} \ - -DIS_CI_BUILD=${CI} \ -DWITH_OSMESA=${WITH_OSMESA} \ -DWITH_EGL=${WITH_EGL}) @@ -391,8 +390,7 @@ $(QT_BUILD): $(BUILD_DEPS) -DWITH_QT_I18N=${WITH_QT_I18N} \ -DWITH_QT_4=${WITH_QT_4} \ -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ - -DWITH_COVERAGE=${WITH_COVERAGE} \ - -DIS_CI_BUILD=${CI}) + -DWITH_COVERAGE=${WITH_COVERAGE}) ifeq ($(HOST_PLATFORM), macos) @@ -407,8 +405,7 @@ $(MACOS_QT_PROJ_PATH): $(BUILD_DEPS) -DWITH_QT_I18N=${WITH_QT_I18N} \ -DWITH_QT_4=${WITH_QT_4} \ -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ - -DWITH_COVERAGE=${WITH_COVERAGE} \ - -DIS_CI_BUILD=${CI}) + -DWITH_COVERAGE=${WITH_COVERAGE}) @# Create Xcode schemes so that we can use xcodebuild from the command line. CMake doesn't @# create these automatically. -- cgit v1.2.1