Browse Source
[skip ci] Fix valgrind benchmark diff output
Don't print command when searching benchmarked commit, as this breaks
the markdown summary.
pull/18211/head
Ilija Tovilo
6 months ago
No known key found for this signature in database
GPG Key ID: 5050C66BFCD1015A
2 changed files with
9 additions and
3 deletions
-
benchmark/generate_diff.php
-
benchmark/shared.php
|
|
@ -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; |
|
|
|
|
|
@ -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]; |
|
|
|