Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dbf6cfb authored by Paul Duffin's avatar Paul Duffin
Browse files

Improve error reporting when a rule cannot be found 

Outputs the list of available rules on separate lines.

Test: m nothing
Change-Id: I845064e032f0a47d00883ff775c4f7b4fee7631e
parent cc1bd836

android/testing.go

+6 −4
Original line number Diff line number Diff line
@@ -713,9 +713,11 @@ func (b baseTestingComponent) newTestingBuildParams(bparams BuildParams) Testing 


func (b baseTestingComponent) maybeBuildParamsFromRule(rule string) (TestingBuildParams, []string) {

	var searchedRules []string

	for _, p := range b.provider.BuildParamsForTests() {

		searchedRules = append(searchedRules, p.Rule.String())

		if strings.Contains(p.Rule.String(), rule) {

	buildParams := b.provider.BuildParamsForTests()

	for _, p := range buildParams {

		ruleAsString := p.Rule.String()

		searchedRules = append(searchedRules, ruleAsString)

		if strings.Contains(ruleAsString, rule) {

			return b.newTestingBuildParams(p), searchedRules

		}

	}
@@ -725,7 +727,7 @@ func (b baseTestingComponent) maybeBuildParamsFromRule(rule string) (TestingBuil 
func (b baseTestingComponent) buildParamsFromRule(rule string) TestingBuildParams {

	p, searchRules := b.maybeBuildParamsFromRule(rule)

	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

}