1 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs b/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs
index 0aa7f3e87..9126a7913 100644
--- a/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs
+++ b/tests/auto/blackbox/testdata/sanitizer/sanitizer.qbs
@@ -1,7 +1,13 @@
 CppApplication {
+    Depends { name: "Sanitizers.address" }
+    Sanitizers.address.enabled: sanitizer === "address"
     property string sanitizer
 
     property bool supportsSanitizer: {
+        if (qbs.toolchain.contains("mingw"))
+            return false;
+        if (sanitizer === "address")
+            return Sanitizers.address._supported;
         if (qbs.toolchain.contains("clang-cl")) {
             if (cpp.toolchainInstallPath.contains("Microsoft Visual Studio")
                     && qbs.architecture === "x86_64") {
@@ -13,8 +19,6 @@ CppApplication {
         }
         if (!qbs.toolchain.contains("gcc"))
             return false;
-        if (qbs.toolchain.contains("mingw"))
-            return false;
         if (qbs.targetOS.contains("ios")) {
             // thread sanitizer is not supported
             return sanitizer !== "thread";
@@ -34,7 +38,7 @@ CppApplication {
     cpp.minimumMacosVersion: "10.8"
     consoleApplication: true
     cpp.runtimeLibrary: "static"
-    cpp.driverFlags: sanitizer ? ["-fsanitize=" + sanitizer] : []
+    cpp.driverFlags: sanitizer && sanitizer !== "address" ? ["-fsanitize=" + sanitizer] : []
     cpp.debugInformation: true
     files: "sanitizer.cpp"
 }