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 /Makefile | |
| parent | 0c0d7ceaebf822ababc7147c494e88f4c16e18e3 (diff) | |
| download | qtlocation-mapboxgl-eb8a1ef7aa43582202c8b385b9ee0665cc6c838c.tar.gz | |
[tests] Disable timing-based Timer tests in CI
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -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. |