diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2024-02-15 15:42:03 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2024-02-19 10:16:20 +0000 |
| commit | 0ea0aaad73d09c9aa65979f781b8a103a3e1f83b (patch) | |
| tree | 3eaf15f38130cfd4fe936d09f76b8f03ab9848fe | |
| parent | 96d0c30a8c0d131f0cd54e499425b3d43b6e409f (diff) | |
auto-tests: fix the check for QT_FEATURE_am_installer
Pick-to: 6.6 6.5
Change-Id: Ibd6b38b0feeb96402254cfaed576231b014db94c
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
| -rw-r--r-- | tests/data/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | tests/data/create-test-packages.sh | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/data/CMakeLists.txt b/tests/data/CMakeLists.txt index 31b64799..b057bce2 100644 --- a/tests/data/CMakeLists.txt +++ b/tests/data/CMakeLists.txt @@ -1,4 +1,6 @@ +qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/../../src/common-lib/configure.cmake") + if (NOT QT_FEATURE_am_installer) message(WARNING "QT_FEATURE_am_installer is disabled, cannot generate test packages") return() diff --git a/tests/data/create-test-packages.sh b/tests/data/create-test-packages.sh index a0ca3e6c..031dfdb0 100755 --- a/tests/data/create-test-packages.sh +++ b/tests/data/create-test-packages.sh @@ -7,6 +7,9 @@ #set -x set -e +# OpenSSL as used by the packager might leak, but we aren't interested +export ASAN_OPTIONS="exitcode=0:detect_leaks=0" + # check basic requirement [ ! -d certificates ] && { echo "Please cd to the tests/data directory before running this script"; exit 1; } |