diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-15 11:25:47 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-15 15:09:30 -0600 |
| commit | eb8a1ef7aa43582202c8b385b9ee0665cc6c838c (patch) | |
| tree | c9c9bc6acb8db5b9e9b9d4146b74ebe4f6e3827d | |
| parent | 0c0d7ceaebf822ababc7147c494e88f4c16e18e3 (diff) | |
| download | qtlocation-mapboxgl-eb8a1ef7aa43582202c8b385b9ee0665cc6c838c.tar.gz | |
[tests] Disable timing-based Timer tests in CI
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | test/src/mbgl/test/util.hpp | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 56c1fc684d..90f5bf7e1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,6 @@ option(WITH_CXX11ABI "Use cxx11abi mason packages" OFF) option(WITH_COVERAGE "Enable coverage reports" OFF) option(WITH_OSMESA "Use OSMesa headless backend" OFF) option(WITH_EGL "Use EGL backend" OFF) -option(IS_CI_BUILD "Continuous integration build" OFF) if(WITH_CXX11ABI) set(MASON_CXXABI_SUFFIX -cxx11abi) @@ -23,7 +22,7 @@ if(WITH_EGL) add_definitions(-DMBGL_USE_GLES2=1) endif() -if(IS_CI_BUILD) +if($ENV{CI}) add_compile_options(-DCI_BUILD=1) endif() @@ -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. diff --git a/test/src/mbgl/test/util.hpp b/test/src/mbgl/test/util.hpp index 34d8969d3c..82d5c520f8 100644 --- a/test/src/mbgl/test/util.hpp +++ b/test/src/mbgl/test/util.hpp @@ -21,7 +21,7 @@ #define TEST_IS_SIMULATOR 0 #endif -#if !TEST_IS_SIMULATOR +#if !TEST_IS_SIMULATOR && !CI_BUILD #define TEST_REQUIRES_ACCURATE_TIMING(name) name #else #define TEST_REQUIRES_ACCURATE_TIMING(name) DISABLED_ ## name |