Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix output for downloading test inputs #3112

Merged
merged 2 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ genrule(
plugins = {
"python": "v1.5.1",
"java": "v0.4.0",
"go": "v1.16.10",
"go": "v1.17.2",
"cc": "v0.4.0",
"shell": "v0.2.0",
"go-proto": "v0.3.0",
Expand Down
1 change: 1 addition & 0 deletions src/build/build_step.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ func prepareOnly(state *core.BuildState, target *core.BuildTarget) error {
if state.RemoteClient != nil {
// Targets were built remotely so we can simply download the inputs and place them in the
// tmp/ folder and exit.
state.LogBuildResult(target, core.TargetBuilding, "Downloading inputs...")
if err := state.DownloadAllInputs(target, target.TmpDir(), false); err != nil {
return err
}
Expand Down
1 change: 0 additions & 1 deletion src/core/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,6 @@ func (state *BuildState) DownloadInputsIfNeeded(target *BuildTarget, runtime boo

// DownloadAllInputs downloads all inputs (including sources) for the target. Assumes remote execution.
func (state *BuildState) DownloadAllInputs(target *BuildTarget, targetDir string, isTest bool) error {
state.LogBuildResult(target, TargetBuilding, "Downloading inputs...")
return state.RemoteClient.DownloadInputs(target, targetDir, isTest)
}

Expand Down
1 change: 1 addition & 0 deletions src/test/test_step.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ func prepareOnly(state *core.BuildState, label core.BuildLabel, target *core.Bui
if state.RemoteClient != nil {
// Targets were built remotely so we can simply download the inputs and place them in the
// tmp/ folder and exit.
state.LogTestRunning(target, runNumber, core.TargetTesting, "Downloading inputs...")
if err := state.DownloadAllInputs(target, target.TestDir(runNumber), true); err != nil {
state.LogBuildError(label, core.TargetTestFailed, err, "Failed to download test inputs")
return
Expand Down
Loading