Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[web] Log all goldctl commands #32072

Merged
mdebbar merged 1 commit into from
Mar 17, 2022
Merged

[web] Log all goldctl commands #32072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions web_sdk/web_test_utils/lib/skia_client.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class SkiaGoldClient {
'--luci',
];

final ProcessResult result = await process.run(authCommand);
final ProcessResult result = await _runCommand(authCommand);

if (result.exitCode != 0) {
final StringBuffer buf = StringBuffer()
Expand All @@ -108,6 +108,11 @@ class SkiaGoldClient {
}
}

Future<ProcessResult> _runCommand(List<String> command) {
print(command.join(' '));
return process.run(command);
}

/// Executes the `imgtest init` command in the `goldctl` tool.
///
/// The `imgtest` command collects and uploads test results to the Skia Gold
Expand Down Expand Up @@ -144,7 +149,7 @@ class SkiaGoldClient {
throw Exception(buf.toString());
}

final ProcessResult result = await process.run(imgtestInitCommand);
final ProcessResult result = await _runCommand(imgtestInitCommand);

if (result.exitCode != 0) {
final StringBuffer buf = StringBuffer()
Expand Down Expand Up @@ -186,7 +191,7 @@ class SkiaGoldClient {
..._getMatchingArguments(testName, screenshotSize, isCanvaskitTest),
];

final ProcessResult result = await process.run(imgtestCommand);
final ProcessResult result = await _runCommand(imgtestCommand);

if (result.exitCode != 0) {
// We do not want to throw for non-zero exit codes here, as an intentional
Expand Down Expand Up @@ -215,7 +220,7 @@ class SkiaGoldClient {
await failures.create();
final String commitHash = await _getCurrentCommit();

final List<String> imgtestInitCommand = <String>[
final List<String> tryjobInitCommand = <String>[
_goldctl,
'imgtest', 'init',
'--instance', _instance,
Expand All @@ -229,16 +234,16 @@ class SkiaGoldClient {
...getCIArguments(),
];

if (imgtestInitCommand.contains(null)) {
if (tryjobInitCommand.contains(null)) {
final StringBuffer buf = StringBuffer()
..writeln('A null argument was provided for Skia Gold tryjob init.')
..writeln('Please confirm the settings of your golden file test.')
..writeln('Arguments provided:');
imgtestInitCommand.forEach(buf.writeln);
tryjobInitCommand.forEach(buf.writeln);
throw Exception(buf.toString());
}

final ProcessResult result = await process.run(imgtestInitCommand);
final ProcessResult result = await _runCommand(tryjobInitCommand);

if (result.exitCode != 0) {
final StringBuffer buf = StringBuffer()
Expand Down Expand Up @@ -271,7 +276,7 @@ class SkiaGoldClient {
) async {
await _tryjobInit();

final List<String> imgtestCommand = <String>[
final List<String> tryjobCommand = <String>[
_goldctl,
'imgtest', 'add',
'--work-dir', _tempPath,
Expand All @@ -280,7 +285,7 @@ class SkiaGoldClient {
..._getMatchingArguments(testName, screenshotSize, isCanvaskitTest),
];

final ProcessResult result = await process.run(imgtestCommand);
final ProcessResult result = await _runCommand(tryjobCommand);

final String resultStdout = result.stdout.toString();
if (result.exitCode != 0 &&
Expand Down