summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2022-05-02 10:05:34 +0200
committerMichal Klocek <michal.klocek@qt.io>2022-05-03 12:03:40 +0200
commit2c5b25387c89420cc04decb1298356e452bb5fe5 (patch)
tree5a20e7eaeff4c725d2b572ccd673bd7076ded3d4 /cmake
parentfd2fc0d2a86f39d563720563555ca6319f8ab223 (diff)
downloadqtwebengine-2c5b25387c89420cc04decb1298356e452bb5fe5.tar.gz
Add workaround for unstable gn on macOS in ci
In ci 'gn' can crash making it hard to integrate, if there is high load crashes occur more frequently sometimes even blocking integrations for few days. Limit number of worker threads for gn as this improves situation however increases time for generating ninja files from 2s to 7s. Note this will not prevent crashes however significantly reduces the issue (when running in loop from 1 per ~10min to 1 per ~3days) Compilation with address or thread sanitizer does not lead to meaningful traces. Moreover running gn with sanitizer creates deadlocks for unknown reason every few runs. Current assumptions is that macos vms are unstable as crashes also occur for sscache calls (compiler) and python calls. Pick-to: 6.3 6.2 Change-Id: I1c488796eb0547eedd20101606f18ed55718e9c2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Functions.cmake1
-rw-r--r--cmake/Gn.cmake4
2 files changed, 5 insertions, 0 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 0346ff5d9..89f4cdd39 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -1135,6 +1135,7 @@ function(add_gn_command)
-DMODULE=${arg_MODULE}
-DQT_HOST_GN_PATH=${QT_HOST_GN_PATH}
-DPython3_EXECUTABLE=${Python3_EXECUTABLE}
+ -DGN_THREADS=$ENV{QTWEBENGINE_GN_THREADS}
-P ${WEBENGINE_ROOT_SOURCE_DIR}/cmake/Gn.cmake
WORKING_DIRECTORY ${WEBENGINE_ROOT_BUILD_DIR}
COMMENT "Run gn for target ${arg_CMAKE_TARGET} in ${arg_BUILDDIR}"
diff --git a/cmake/Gn.cmake b/cmake/Gn.cmake
index 951e5f83e..99f4dae38 100644
--- a/cmake/Gn.cmake
+++ b/cmake/Gn.cmake
@@ -44,6 +44,10 @@ list(APPEND gnArg
--script-executable=${Python3_EXECUTABLE}
--root=${WEBENGINE_ROOT_SOURCE_DIR}/src/3rdparty/chromium)
+if(GN_THREADS)
+ list(APPEND gnArg --threads=${GN_THREADS})
+endif()
+
STRING(REGEX REPLACE "\n" ";" printArgArg "${gnArgArg}")
LIST(SORT printArgArg)
STRING(REGEX REPLACE ";" "\n" printArgArg "${printArgArg}")