From b2700811f3fa701a14701fc1a9e629f468e7d8a1 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 15 Oct 2020 10:40:23 +0200
Subject: [PATCH] Skip arginfo test under msan

Msan is missing interceptors for some functions that result in
false positives.
---
 Zend/tests/arginfo_zpp_mismatch.phpt | 4 ++++
 azure-pipelines.yml                  | 2 +-
 run-tests.php                        | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Zend/tests/arginfo_zpp_mismatch.phpt b/Zend/tests/arginfo_zpp_mismatch.phpt
index cd37fbf33a..2a9522a6de 100644
--- a/Zend/tests/arginfo_zpp_mismatch.phpt
+++ b/Zend/tests/arginfo_zpp_mismatch.phpt
@@ -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
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index beb512c735..e962dad8aa 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -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:
diff --git a/run-tests.php b/run-tests.php
index 761ef949fe..011885c678 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -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)) {
-- 
2.50.1