diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2024-02-01 13:49:58 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2024-02-05 16:36:24 +0100 |
| commit | 84fa677957bfeae3973edd743d437d326b6102e1 (patch) | |
| tree | 3ee9b07a6ca0c1f205916af2702521f444bac9d1 | |
| parent | 35f29ccc470094805f757fd76a8648f66d7c4995 (diff) | |
Disable the special qmake test setup inside an ASAN build
Change-Id: Ib89042313847fe2f1e0f9bba07262b4bcfdf5c81
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 8 | ||||
| -rw-r--r-- | tests/auto/core/ifcodegen/CMakeLists.txt | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 2e3b412b..b0e59f96 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -18,6 +18,14 @@ instructions: - type: EnvironmentVariable variableName: BUILD_DOCUMENTATION variableValue: "1" + # Detect an ASAN build and set an env variable for CMake + - type: AppendToEnvironmentVariable + variableName: COIN_ASAN_BUILD + variableValue: "1" + enable_if: + condition: property + property: features + contains_value: UseAddressSanitizer # Detect python3 and make ifcodegen mandatory for all configs - type: AppendToEnvironmentVariable variableName: NON_QTBASE_CMAKE_ARGS diff --git a/tests/auto/core/ifcodegen/CMakeLists.txt b/tests/auto/core/ifcodegen/CMakeLists.txt index b5953bf1..fb25da59 100644 --- a/tests/auto/core/ifcodegen/CMakeLists.txt +++ b/tests/auto/core/ifcodegen/CMakeLists.txt @@ -24,7 +24,7 @@ endif() # The CMAKE_OSX_ARCHITECTURES is defined when building several architectures in one go # Running qmake in that setup doesn't work if (QT_BUILD_STANDALONE_TESTS OR QT_BUILD_QMAKE_TEST) - if (NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_OSX_ARCHITECTURES) + if (NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_OSX_ARCHITECTURES AND NOT DEFINED ENV{COIN_ASAN_BUILD}) include(ProcessorCount) ProcessorCount(CPU_COUNT) if(CPU_COUNT EQUAL 0) |