From cae59e5c525197fa371cf0e0a120ea8efe679227 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 15 Feb 2017 11:25:47 -0800
Subject: [PATCH] [tests] Disable timing-based Timer tests in CI

Cherry-picked from eb8a1ef7aa43582202c8b385b9ee0665cc6c838c.
---
 CMakeLists.txt              | 4 ++++
 test/src/mbgl/test/util.hpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e99f8031e5..f36e6ef2e3c 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 b8ecf175aac..bce1175c942 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