archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2'

Browse source 
* PHP-8.2:
  [skip ci] Fix diff cmd env name in run-tests.php
This commit is contained in:
Ilija Tovilo 2023-03-10 01:10:55 +01:00
commit c0ee8e833c
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
run-tests.php
View file

@ -3043,7 +3043,7 @@ function generate_diff_external(string $diff_cmd, string $exp_file, string $outp
{
$retval = shell_exec("{$diff_cmd} {$exp_file} {$output_file}");
return is_string($retval) ? $retval : 'Could not run external diff tool set through PHP_TEST_DIFF_CMD environment variable';
return is_string($retval) ? $retval : 'Could not run external diff tool set through TEST_PHP_DIFF_CMD environment variable';
}
function generate_diff(string $wanted, ?string $wanted_re, string $output): string