From 4c0212453a989d2f8d32c44b6a44f0829cde29cf Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Wed, 13 May 2020 01:13:50 +0100 Subject: [PATCH] Improved formatting of a module list in a panic message. Test: m nothing Change-Id: I8816359232ef0d8e2352d2f47bf6182fb3c57768 --- android/testing.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/android/testing.go b/android/testing.go index 90989ef53..696efb6f8 100644 --- a/android/testing.go +++ b/android/testing.go @@ -18,6 +18,7 @@ import ( "fmt" "path/filepath" "regexp" + "sort" "strings" "testing" @@ -122,9 +123,10 @@ func (ctx *TestContext) ModuleForTests(name, variant string) TestingModule { ctx.VisitAllModules(func(m blueprint.Module) { allModuleNames = append(allModuleNames, m.(Module).Name()+"("+ctx.ModuleSubDir(m)+")") }) + sort.Strings(allModuleNames) - panic(fmt.Errorf("failed to find module %q variant %q."+ - "\nall modules: %v", name, variant, allModuleNames)) + panic(fmt.Errorf("failed to find module %q variant %q. All modules:\n %s", + name, variant, strings.Join(allModuleNames, "\n "))) } return TestingModule{module}