fix tests that invoke PHP and thus don't inherit run-tests.php INI se…

…ttings
php · Jan 8, 2025 · a44ac31 · a44ac31
1 parent 47148c1
commit a44ac31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Zend/tests/new_oom.phpt b/Zend/tests/new_oom.phpt
@@ -13,7 +13,7 @@ $php = PHP_BINARY;
 
 foreach (get_declared_classes() as $class) {
     $output = shell_exec("$php --no-php-ini $file $class 2>&1");
-    if ($output && preg_match('(^\nFatal error: Allowed memory size of [0-9]+ bytes exhausted[^\r\n]* \(tried to allocate [0-9]+ bytes\) in [^\r\n]+ on line [0-9]+$)', $output) !== 1) {
+    if ($output && preg_match('/^\nFatal error: Allowed memory size of [0-9]+ bytes exhausted[^\r\n]* \(tried to allocate [0-9]+ bytes\) in [^\r\n]+ on line [0-9]+\nStack trace:\n(#[0-9]+ [^\r\n]+\n)+$/', $output) !== 1) {
         echo "Class $class failed\n";
         echo $output, "\n";
     }

diff --git a/ext/opcache/tests/gh8846.phpt b/ext/opcache/tests/gh8846.phpt
@@ -34,6 +34,9 @@ echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/gh8846-index.php?s
 bool(true)
 <br />
 <b>Fatal error</b>:  Cannot redeclare class Foo (previously declared in %sgh8846-1.inc:2) in <b>%sgh8846-2.inc</b> on line <b>%d</b><br />
+Stack trace:
+#0 %sgh8846-index.php(%d): include()
+#1 {main}
 
 bool(true)
 Ok