php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add zend_alloc XLEAK support

Browse Source 
In the future we may want to use a different exit code to warn for tests that
didn't leak.

Closes GH-10999
This commit is contained in:
Ilija Tovilo
2023-04-03 11:37:27 +02:00
parent 8360efde8d
commit fc88f155be
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Zend/zend_alloc.c
View File

@@ -2290,7 +2290,10 @@ void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)
#if ZEND_DEBUG
if (!silent) {
zend_mm_check_leaks(heap);
char *tmp = getenv("ZEND_ALLOC_PRINT_LEAKS");
if (!tmp || ZEND_ATOL(tmp)) {
zend_mm_check_leaks(heap);
}
}
#endif

2
ext/pcntl/tests/bug81577_3.phpt
View File

@@ -3,7 +3,7 @@ Bug #81577: (Exceptions in interrupt handlers: cleanup_live_vars)
--EXTENSIONS--
pcntl
posix
--XFAIL--
--XLEAK--
leaks are not fixed yet
--FILE--
<?php

11
run-tests.php
View File

@@ -2464,8 +2464,11 @@ TEST $file
$cmd = $valgrind->wrapCommand($cmd, $memcheck_filename, strpos($test_file, "pcre") !== false);
}
if ($test->hasSection('XLEAK') && isset($env['SKIP_ASAN'])) {
$env['LSAN_OPTIONS'] = 'detect_leaks=0';
if ($test->hasSection('XLEAK')) {
$env['ZEND_ALLOC_PRINT_LEAKS'] = '0';
if (isset($env['SKIP_ASAN'])) {
$env['LSAN_OPTIONS'] = 'detect_leaks=0';
}
}
if ($DETAILED) {
@@ -2664,7 +2667,7 @@ COMMAND $cmd
if ($test->hasSection('XFAIL')) {
$warn = true;
$info = " (warn: XFAIL section but test passes)";
} elseif ($test->hasSection('XLEAK') && !isset($env['SKIP_ASAN'])) {
} elseif ($test->hasSection('XLEAK') && $valgrind) {
// XLEAK with ASAN completely disables LSAN so the test is expected to pass
$warn = true;
$info = " (warn: XLEAK section but test passes)";
@@ -2702,7 +2705,7 @@ COMMAND $cmd
if ($test->hasSection('XFAIL')) {
$restype[] = 'XFAIL';
$info = ' XFAIL REASON: ' . rtrim($test->getSection('XFAIL'));
} elseif ($test->hasSection('XLEAK') && !isset($env['SKIP_ASAN'])) {
} elseif ($test->hasSection('XLEAK') && $valgrind) {
// XLEAK with ASAN completely disables LSAN so the test is expected to pass
$restype[] = 'XLEAK';
$info = ' XLEAK REASON: ' . rtrim($test->getSection('XLEAK'));