Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Disable timing-based Timer tests in CI #8100

Merged
merged 1 commit into from
Feb 17, 2017
Merged

Disable timing-based Timer tests in CI #8100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/src/mbgl/test/util.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down