diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-15 11:25:47 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2017-02-17 13:39:48 -0800 |
| commit | 28ad35fc0461aa89b490e3b187fca5374f18596d (patch) | |
| tree | 2844ce36a3b4bbea46fdae1665bd6ed5b7bc89e6 | |
| parent | 7d6b91f8e79cd96fdef8c0307f8eca1687eaa6d0 (diff) | |
| download | qtlocation-mapboxgl-28ad35fc0461aa89b490e3b187fca5374f18596d.tar.gz | |
[tests] Disable timing-based Timer tests in CI
Cherry-picked from eb8a1ef7aa43582202c8b385b9ee0665cc6c838c.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/src/mbgl/test/util.hpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e99f8031e..f36e6ef2e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,10 @@ if(WITH_OSMESA) add_compile_options(-D__OSMESA__) endif() +if($ENV{CI}) + add_compile_options(-DCI_BUILD=1) +endif() + mason_use(geometry VERSION 0.8.0 HEADER_ONLY) mason_use(variant VERSION 1.1.0 HEADER_ONLY) mason_use(unique_resource VERSION dev HEADER_ONLY) diff --git a/test/src/mbgl/test/util.hpp b/test/src/mbgl/test/util.hpp index b8ecf175aa..bce1175c94 100644 --- a/test/src/mbgl/test/util.hpp +++ b/test/src/mbgl/test/util.hpp @@ -18,7 +18,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 |