aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2021-10-26 18:22:16 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2022-08-09 12:52:38 +0000
commitffc3a556d880c67d65d05dbfa8b871c22b915f85 (patch)
tree2f5a142a6b896f39366ea57090b0ab8ec13c5a9a
parent4c47fbfb0812fc1ce90fd26411382e3c3bb7f839 (diff)
GitHub actions: enable sanitizer for the Qt6 buildHEADmaster
Change-Id: I1222e7d9a49439d6f0067ae2b1e38da113bb3faa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--.github/workflows/main.yml4
-rw-r--r--scripts/address-sanitizer-suppressions.txt1
m---------src/shared/qtscript0
3 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f3ab462c9..f4f213cc1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,7 +58,7 @@ jobs:
build-linux-extra:
name: ${{ matrix.config.name }}
runs-on: ubuntu-latest
- timeout-minutes: 60
+ timeout-minutes: 90
strategy:
fail-fast: false
matrix:
@@ -88,7 +88,7 @@ jobs:
image: 'focal-qt6',
script: './scripts/build-qbs-with-qbs.sh',
options: 'modules.cpp.compilerWrapper:ccache
- modules.qbsbuildconfig.enableAddressSanitizer:false
+ products.qbsscriptengine.qbsbuildconfig.enableAddressSanitizer:false
modules.qbs.debugInformation:true
modules.qbsbuildconfig.enableBundledQt:true',
cacheid: 'gcc-qt6',
diff --git a/scripts/address-sanitizer-suppressions.txt b/scripts/address-sanitizer-suppressions.txt
index f3e1980b1..b31f34a05 100644
--- a/scripts/address-sanitizer-suppressions.txt
+++ b/scripts/address-sanitizer-suppressions.txt
@@ -1,3 +1,4 @@
leak:libQt5Script.so.5
+leak:libqbsscriptengine.so
leak:QThreadPrivate::QThreadPrivate
leak:QArrayData::allocate
diff --git a/src/shared/qtscript b/src/shared/qtscript
-Subproject e19477e1129a4c64e023006c59878637d594e99
+Subproject 2c1ffc66bf5d5db05018d7b06253b5ca51e557a