Skip to content

Commit 0844464

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Suppress snmp lib memory leak, skip ASAN tests
2 parents 23c6804 + b085842 commit 0844464

11 files changed

+11
-0
lines changed

.github/lsan-suppressions.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
leak:acommon::DictInfoList::elements
2+
leak:netsnmp_init_mib_internals

ext/snmp/tests/snmp-object-errno-errstr.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ snmp
77
--SKIPIF--
88
<?php
99
require_once(__DIR__.'/skipif.inc');
10+
if (getenv('SKIP_ASAN')) die('skip Timeouts under ASAN');
1011
?>
1112
--FILE--
1213
<?php

ext/snmp/tests/snmp-object-error.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ snmp
77
--SKIPIF--
88
<?php
99
require_once(__DIR__.'/skipif.inc');
10+
if (getenv('SKIP_ASAN')) die('skip Timeouts under ASAN');
1011
?>
1112
--FILE--
1213
<?php

ext/snmp/tests/snmp2_get.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ snmp
77
--SKIPIF--
88
<?php
99
require_once(__DIR__.'/skipif.inc');
10+
if (getenv('SKIP_ASAN')) die('skip Timeouts under ASAN');
1011
?>
1112
--FILE--
1213
<?php

ext/snmp/tests/snmp2_set-nomib.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ snmp
77
--SKIPIF--
88
<?php
99
require_once(__DIR__.'/skipif.inc');
10+
if (getenv('SKIP_ASAN')) die('skip Timeouts under ASAN');
1011
?>
1112
--ENV--
1213
MIBS=

ext/snmp/tests/snmp2_walk.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ snmp
77
--SKIPIF--
88
<?php
99
require_once(__DIR__.'/skipif.inc');
10+
if (getenv('SKIP_ASAN')) die('skip Timeouts under ASAN');
1011
?>
1112
--FILE--
1213
<?php

ext/snmp/tests/snmp3-error.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ snmp
77
--SKIPIF--
88
<?php
99
require_once(__DIR__.'/skipif.inc');
10+
if (getenv('SKIP_ASAN')) die('skip Timeouts under ASAN');
1011
?>
1112
--FILE--
1213
<?php

ext/snmp/tests/snmp_getvalue.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ snmp
88
<?php
99
require_once(__DIR__.'/skipif.inc');
1010
if (PHP_OS_FAMILY === "Windows") die("xfail fails on Windows for unknown reasons");
11+
if (getenv('SKIP_ASAN')) die('skip Timeouts under ASAN');
1112
?>
1213
--FILE--
1314
<?php

ext/snmp/tests/snmpget.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ snmp
77
--SKIPIF--
88
<?php
99
require_once(__DIR__.'/skipif.inc');
10+
if (getenv('SKIP_ASAN')) die('skip Timeouts under ASAN');
1011
?>
1112
--FILE--
1213
<?php

ext/snmp/tests/snmpset-nomib.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ snmp
77
--SKIPIF--
88
<?php
99
require_once(__DIR__.'/skipif.inc');
10+
if (getenv('SKIP_ASAN')) die('skip Timeouts under ASAN');
1011
?>
1112
--ENV--
1213
MIBS=

ext/snmp/tests/snmpwalk.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ snmp
77
--SKIPIF--
88
<?php
99
require_once(__DIR__.'/skipif.inc');
10+
if (getenv('SKIP_ASAN')) die('skip Timeouts under ASAN');
1011
?>
1112
--FILE--
1213
<?php

0 commit comments

Comments
 (0)