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

Shorten missing module panic message

Browse Source 
Only print the list of variants of the matching module when
ctx.ModuleForTesting finds the module but not the variant.

Test: all soong tests
Change-Id: I51ffdde4645db39ec1d37ec018e0dea11d74280e
This commit is contained in:
Colin Cross
2020-08-11 12:02:11 -07:00
parent 29737cfc94
commit beae6ecbd4
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android/testing.go
View File

@@ -119,14 +119,24 @@ func (ctx *TestContext) ModuleForTests(name, variant string) TestingModule {
if module == nil { if module == nil {
// find all the modules that do exist // find all the modules that do exist
allModuleNames := []string{} var allModuleNames []string
var allVariants []string
ctx.VisitAllModules(func(m blueprint.Module) { ctx.VisitAllModules(func(m blueprint.Module) {
allModuleNames = append(allModuleNames, m.(Module).Name()+"("+ctx.ModuleSubDir(m)+")") allModuleNames = append(allModuleNames, ctx.ModuleName(m))
if ctx.ModuleName(m) == name {
allVariants = append(allVariants, ctx.ModuleSubDir(m))
}
}) })
sort.Strings(allModuleNames) sort.Strings(allModuleNames)
sort.Strings(allVariants)
panic(fmt.Errorf("failed to find module %q variant %q. All modules:\n %s", if len(allVariants) == 0 {
name, variant, strings.Join(allModuleNames, "\n "))) panic(fmt.Errorf("failed to find module %q. All modules:\n %s",
name, strings.Join(allModuleNames, "\n ")))
} else {
panic(fmt.Errorf("failed to find module %q variant %q. All variants:\n %s",
name, variant, strings.Join(allVariants, "\n ")))
}
} }
return TestingModule{module} return TestingModule{module}