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

Improve error reporting when a rule cannot be found am: 4dbf6cfbae

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736223

Change-Id: Ida5552db4748838406f41d66f101aff1a7b3443c
This commit is contained in:
Paul Duffin
2021-06-14 20:20:22 +00:00
committed by Automerger Merge Worker
parent 174d9c7eec 4dbf6cfbae
commit d0a7be3222
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/testing.go
View File

@@ -713,9 +713,11 @@ func (b baseTestingComponent) newTestingBuildParams(bparams BuildParams) Testing
func (b baseTestingComponent) maybeBuildParamsFromRule(rule string) (TestingBuildParams, []string) { func (b baseTestingComponent) maybeBuildParamsFromRule(rule string) (TestingBuildParams, []string) {
var searchedRules []string var searchedRules []string
for _, p := range b.provider.BuildParamsForTests() { buildParams := b.provider.BuildParamsForTests()
searchedRules = append(searchedRules, p.Rule.String()) for _, p := range buildParams {
if strings.Contains(p.Rule.String(), rule) { ruleAsString := p.Rule.String()
searchedRules = append(searchedRules, ruleAsString)
if strings.Contains(ruleAsString, rule) {
return b.newTestingBuildParams(p), searchedRules return b.newTestingBuildParams(p), searchedRules
} }
} }
@@ -725,7 +727,7 @@ func (b baseTestingComponent) maybeBuildParamsFromRule(rule string) (TestingBuil
func (b baseTestingComponent) buildParamsFromRule(rule string) TestingBuildParams { func (b baseTestingComponent) buildParamsFromRule(rule string) TestingBuildParams {
p, searchRules := b.maybeBuildParamsFromRule(rule) p, searchRules := b.maybeBuildParamsFromRule(rule)
if p.Rule == nil { if p.Rule == nil {
panic(fmt.Errorf("couldn't find rule %q.\nall rules: %v", rule, searchRules)) panic(fmt.Errorf("couldn't find rule %q.\nall rules:\n%s", rule, strings.Join(searchRules, "\n")))
} }
return p return p
} }