Skip to content

Commit 100ac24

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Skip arginfo test under msan
2 parents d384233 + b270081 commit 100ac24

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

Zend/tests/arginfo_zpp_mismatch.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
--TEST--
22
Test that there is no arginfo/zpp mismatch
3+
--SKIPIF--
4+
<?php
5+
if (getenv('SKIP_MSAN')) die("skip msan misses interceptors for some functions");
6+
?>
37
--FILE--
48
<?php
59

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
parameters:
8585
configurationName: DEBUG_ZTS_MSAN
8686
configurationParameters: '--enable-debug --enable-zts'
87-
runTestsParameters: --asan
87+
runTestsParameters: --msan
8888
timeoutInMinutes: 90
8989
- template: azure/community_job.yml
9090
parameters:

run-tests.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,14 @@ function main(): void
608608
$shuffle = true;
609609
break;
610610
case '--asan':
611+
case '--msan':
611612
$environment['USE_ZEND_ALLOC'] = 0;
612613
$environment['USE_TRACKED_ALLOC'] = 1;
613614
$environment['SKIP_ASAN'] = 1;
614615
$environment['SKIP_PERF_SENSITIVE'] = 1;
616+
if ($switch === '--msan') {
617+
$environment['SKIP_MSAN'] = 1;
618+
}
615619

616620
$lsanSuppressions = __DIR__ . '/azure/lsan-suppressions.txt';
617621
if (file_exists($lsanSuppressions)) {

0 commit comments

Comments
 (0)