StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show less ambiguous paths in the error when it fails to match the given output file."

Browse Source
This commit is contained in:
Martin Stjernholm
2021-09-20 17:44:01 +00:00
committed by Gerrit Code Review
parent dd6149122c a4aaa47a00
commit bacf6a1a6a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/testing.go
View File

@@ -808,7 +808,7 @@ func (b baseTestingComponent) buildParamsFromDescription(desc string) TestingBui
} }
func (b baseTestingComponent) maybeBuildParamsFromOutput(file string) (TestingBuildParams, []string) { func (b baseTestingComponent) maybeBuildParamsFromOutput(file string) (TestingBuildParams, []string) {
var searchedOutputs []string searchedOutputs := WritablePaths(nil)
for _, p := range b.provider.BuildParamsForTests() { for _, p := range b.provider.BuildParamsForTests() {
outputs := append(WritablePaths(nil), p.Outputs...) outputs := append(WritablePaths(nil), p.Outputs...)
outputs = append(outputs, p.ImplicitOutputs...) outputs = append(outputs, p.ImplicitOutputs...)
@@ -819,10 +819,17 @@ func (b baseTestingComponent) maybeBuildParamsFromOutput(file string) (TestingBu
if f.String() == file || f.Rel() == file || PathRelativeToTop(f) == file { if f.String() == file || f.Rel() == file || PathRelativeToTop(f) == file {
return b.newTestingBuildParams(p), nil return b.newTestingBuildParams(p), nil
} }
searchedOutputs = append(searchedOutputs, f.Rel()) searchedOutputs = append(searchedOutputs, f)
} }
} }
return TestingBuildParams{}, searchedOutputs
formattedOutputs := []string{}
for _, f := range searchedOutputs {
formattedOutputs = append(formattedOutputs,
fmt.Sprintf("%s (rel=%s)", PathRelativeToTop(f), f.Rel()))
}
return TestingBuildParams{}, formattedOutputs
} }
func (b baseTestingComponent) buildParamsFromOutput(file string) TestingBuildParams { func (b baseTestingComponent) buildParamsFromOutput(file string) TestingBuildParams {