1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.2'

* 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

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