From 5a8942b9b97db71e61be0dff9a0644bc444b7340 Mon Sep 17 00:00:00 2001 From: Juha Alanen Date: Thu, 14 May 2020 10:27:31 +0300 Subject: [build] Disable benchmarks in CI on Linux and Mac --- platform/linux/linux.cmake | 5 ++++- platform/macos/macos.cmake | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/linux/linux.cmake b/platform/linux/linux.cmake index 971f68ce4a..a9a6e73e26 100644 --- a/platform/linux/linux.cmake +++ b/platform/linux/linux.cmake @@ -144,7 +144,10 @@ target_link_libraries( PRIVATE mbgl-compiler-options mbgl-render-test ) -add_test(NAME mbgl-benchmark-runner COMMAND mbgl-benchmark-runner WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) +# Disable benchmarks in CI as they run in VM environment +if(NOT DEFINED ENV{CI}) + add_test(NAME mbgl-benchmark-runner COMMAND mbgl-benchmark-runner WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) +endif() add_test(NAME mbgl-test-runner COMMAND mbgl-test-runner WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) install(TARGETS mbgl-render-test-runner RUNTIME DESTINATION bin) diff --git a/platform/macos/macos.cmake b/platform/macos/macos.cmake index 3cd4df090f..4331852aa2 100644 --- a/platform/macos/macos.cmake +++ b/platform/macos/macos.cmake @@ -143,8 +143,8 @@ set_property(TARGET mbgl-benchmark-runner PROPERTY FOLDER Executables) set_property(TARGET mbgl-test-runner PROPERTY FOLDER Executables) set_property(TARGET mbgl-render-test-runner PROPERTY FOLDER Executables) -# MacOS CI tests run with SW rendering and it causes benchmark to timeout for debug builds -if(NOT DEFINED ENV{CI} OR CMAKE_BUILD_TYPE STREQUAL Release) +# Disable benchmarks in CI as they run in VM environment +if(NOT DEFINED ENV{CI}) add_test(NAME mbgl-benchmark-runner COMMAND mbgl-benchmark-runner WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) endif() add_test(NAME mbgl-test-runner COMMAND mbgl-test-runner WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) -- cgit v1.2.1