Merge "Improved formatting of a module list in a panic message."

This commit is contained in:
Treehugger Robot
2020-06-01 16:20:50 +00:00
committed by Gerrit Code Review

View File

@@ -18,6 +18,7 @@ import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"regexp" "regexp"
"sort"
"strings" "strings"
"testing" "testing"
@@ -122,9 +123,10 @@ func (ctx *TestContext) ModuleForTests(name, variant string) TestingModule {
ctx.VisitAllModules(func(m blueprint.Module) { ctx.VisitAllModules(func(m blueprint.Module) {
allModuleNames = append(allModuleNames, m.(Module).Name()+"("+ctx.ModuleSubDir(m)+")") allModuleNames = append(allModuleNames, m.(Module).Name()+"("+ctx.ModuleSubDir(m)+")")
}) })
sort.Strings(allModuleNames)
panic(fmt.Errorf("failed to find module %q variant %q."+ panic(fmt.Errorf("failed to find module %q variant %q. All modules:\n %s",
"\nall modules: %v", name, variant, allModuleNames)) name, variant, strings.Join(allModuleNames, "\n ")))
} }
return TestingModule{module} return TestingModule{module}