Skip to content

Commit 48725d8

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fixed bug #80437
2 parents 89891d7 + 15073d8 commit 48725d8

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

run-tests.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2833,7 +2833,8 @@ function run_test(string $php, $file, array $env): string
28332833
}
28342834

28352835
// write .sh
2836-
$sh_script = <<<SH
2836+
if (strpos($log_format, 'S') !== false) {
2837+
$sh_script = <<<SH
28372838
#!/bin/sh
28382839
28392840
case "$1" in
@@ -2851,10 +2852,11 @@ function run_test(string $php, $file, array $env): string
28512852
;;
28522853
esac
28532854
SH;
2854-
if (strpos($log_format, 'S') !== false && file_put_contents($sh_filename, $sh_script) === false) {
2855-
error("Cannot create test shell script - $sh_filename");
2855+
if (file_put_contents($sh_filename, $sh_script) === false) {
2856+
error("Cannot create test shell script - $sh_filename");
2857+
}
2858+
chmod($sh_filename, 0755);
28562859
}
2857-
chmod($sh_filename, 0755);
28582860

28592861
// write .log
28602862
if (strpos($log_format, 'L') !== false && file_put_contents($log_filename, "

0 commit comments

Comments
 (0)