diff options
| -rw-r--r-- | src/core/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/CMakeLists.txt | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index cdbfb8e9b..1be73b2ba 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -460,6 +460,14 @@ foreach(arch ${archs}) list(APPEND gnArgArg media_use_ffmpeg=false use_webaudio_ffmpeg=false) endif() endif() + + if(CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm64") + # V8 sandbox initialization is slow in QEMU. + # This is a workaround to avoid auto test timeouts on the QEMU arm64 CI. + if ("$ENV{TARGET_OSVERSION_COIN}" STREQUAL "qemu") + list(APPEND gnArgArg v8_enable_sandbox=false) + endif() + endif() endif() if(MACOS) diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 14612a5b2..6fff2b35c 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,8 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if(LINUX AND CMAKE_CROSSCOMPILING AND (${TEST_architecture_arch} STREQUAL "arm64")) - return() # FIXME -endif() if(TARGET Qt::WebEngineCore) add_subdirectory(httpserver) add_subdirectory(util) |