archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  [skip ci] Fix valgrind benchmark diff output
This commit is contained in:
Ilija Tovilo 2025-03-30 00:45:03 +01:00
commit 20324388a4
No known key found for this signature in database
GPG key ID: 5050C66BFCD1015A
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
benchmark/generate_diff.php
View file

@ -73,7 +73,11 @@ function find_benchmarked_commit_hash(string $repo, string $commitHash): ?string
if (file_exists($summaryFile)) {
break;
}
$commitHash = trim(runCommand(['git', 'rev-parse', $commitHash . '^'], dirname(__DIR__))->stdout);
$commitHash = trim(runCommand(
['git', 'rev-parse', $commitHash . '^'],
dirname(__DIR__),
printCommand: false,
)->stdout);
}
return $commitHash;

6
benchmark/shared.php
View file

@ -5,12 +5,14 @@ class ProcessResult {
public $stderr;
}
function runCommand(array $args, ?string $cwd = null): ProcessResult {
function runCommand(array $args, ?string $cwd = null, bool $printCommand = true): ProcessResult {
$cmd = implode(' ', array_map('escapeshellarg', $args));
$pipes = null;
$result = new ProcessResult();
$descriptorSpec = [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']];
fwrite(STDOUT, "> $cmd\n");
if ($printCommand) {
fwrite(STDOUT, "> $cmd\n");
}
$processHandle = proc_open($cmd, $descriptorSpec, $pipes, $cwd ?? getcwd(), null);
$stdin = $pipes[0];