]> granicus.if.org Git - php/commitdiff
Skip arginfo test under msan
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 15 Oct 2020 08:40:23 +0000 (10:40 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 15 Oct 2020 08:40:23 +0000 (10:40 +0200)
Msan is missing interceptors for some functions that result in
false positives.

Zend/tests/arginfo_zpp_mismatch.phpt
azure-pipelines.yml
run-tests.php

index cd37fbf33a2284de69f95a2424892636134e21b8..2a9522a6de8dccd9fd6d789303d3c29ada04f4f4 100644 (file)
@@ -1,5 +1,9 @@
 --TEST--
 Test that there is no arginfo/zpp mismatch
+--SKIPIF--
+<?php
+if (getenv('SKIP_MSAN')) die("skip msan misses interceptors for some functions");
+?>
 --FILE--
 <?php
 
index beb512c7351b419c614f07895f3b5a0c26d49c56..e962dad8aab5dece694c3306fb3fe896dd10c978 100644 (file)
@@ -84,7 +84,7 @@ jobs:
       parameters:
         configurationName: DEBUG_ZTS_MSAN
         configurationParameters: '--enable-debug --enable-zts'
-        runTestsParameters: --asan
+        runTestsParameters: --msan
         timeoutInMinutes: 90
     - template: azure/community_job.yml
       parameters:
index 761ef949fe931c97333c90b3095ed31d4b0bea92..011885c678e931d91d329292022f662b1b9f92fd 100755 (executable)
@@ -608,10 +608,14 @@ function main(): void
                     $shuffle = true;
                     break;
                 case '--asan':
+                case '--msan':
                     $environment['USE_ZEND_ALLOC'] = 0;
                     $environment['USE_TRACKED_ALLOC'] = 1;
                     $environment['SKIP_ASAN'] = 1;
                     $environment['SKIP_PERF_SENSITIVE'] = 1;
+                    if ($switch === '--msan') {
+                        $environment['SKIP_MSAN'] = 1;
+                    }
 
                     $lsanSuppressions = __DIR__ . '/azure/lsan-suppressions.txt';
                     if (file_exists($lsanSuppressions)) {