diff options
| -rw-r--r-- | android/aconfig_providers.go | 4 | ||||
| -rw-r--r-- | android/config_test.go | 2 | ||||
| -rw-r--r-- | android/namespace.go | 4 | ||||
| -rw-r--r-- | android/testing.go | 6 | ||||
| -rw-r--r-- | android/vintf_fragment_test.go | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/android/aconfig_providers.go b/android/aconfig_providers.go index 210a65638..b698d24a5 100644 --- a/android/aconfig_providers.go +++ b/android/aconfig_providers.go @@ -92,11 +92,11 @@ func VerifyAconfigBuildMode(ctx ModuleContext, container string, module blueprin if asError { ctx.ModuleErrorf(msg) } else { - fmt.Printf("WARNING: " + msg) + fmt.Print("WARNING: " + msg) } } else { if !asError { - fmt.Printf("PASSED: " + msg) + fmt.Print("PASSED: " + msg) } } } diff --git a/android/config_test.go b/android/config_test.go index adb5ffac5..4fdcc9ca4 100644 --- a/android/config_test.go +++ b/android/config_test.go @@ -77,7 +77,7 @@ Did you mean to use an annotation of ",omitempty"? func TestProductConfigAnnotations(t *testing.T) { err := validateConfigAnnotations(&ProductVariables{}) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } } diff --git a/android/namespace.go b/android/namespace.go index 8b3ebc4d5..9ba502514 100644 --- a/android/namespace.go +++ b/android/namespace.go @@ -332,7 +332,7 @@ func (r *NameResolver) MissingDependencyError(depender string, dependerNamespace if isAbs { // if the user gave a fully-qualified name, we don't need to look for other // modules that they might have been referring to - return fmt.Errorf(text) + return fmt.Errorf("%s", text) } // determine which namespaces the module can be found in @@ -368,7 +368,7 @@ func (r *NameResolver) MissingDependencyError(depender string, dependerNamespace text += fmt.Sprintf("\nOr did you mean %q?", guess) } - return fmt.Errorf(text) + return fmt.Errorf("%s", text) } func (r *NameResolver) GetNamespace(ctx blueprint.NamespaceContext) blueprint.Namespace { diff --git a/android/testing.go b/android/testing.go index 765839ffa..6c4f4f8de 100644 --- a/android/testing.go +++ b/android/testing.go @@ -1157,7 +1157,7 @@ func AndroidMkEntriesForTest(t *testing.T, ctx *TestContext, mod blueprint.Modul var p AndroidMkEntriesProvider var ok bool if p, ok = mod.(AndroidMkEntriesProvider); !ok { - t.Errorf("module does not implement AndroidMkEntriesProvider: " + mod.Name()) + t.Error("module does not implement AndroidMkEntriesProvider: " + mod.Name()) } entriesList := p.AndroidMkEntries() @@ -1177,7 +1177,7 @@ func AndroidMkInfoForTest(t *testing.T, ctx *TestContext, mod blueprint.Module) t.Helper() var ok bool if _, ok = mod.(AndroidMkProviderInfoProducer); !ok { - t.Errorf("module does not implement AndroidMkProviderInfoProducer: " + mod.Name()) + t.Error("module does not implement AndroidMkProviderInfoProducer: " + mod.Name()) } info := OtherModuleProviderOrDefault(ctx, mod, AndroidMkInfoProvider) @@ -1197,7 +1197,7 @@ func AndroidMkDataForTest(t *testing.T, ctx *TestContext, mod blueprint.Module) var p AndroidMkDataProvider var ok bool if p, ok = mod.(AndroidMkDataProvider); !ok { - t.Fatalf("module does not implement AndroidMkDataProvider: " + mod.Name()) + t.Fatal("module does not implement AndroidMkDataProvider: " + mod.Name()) } data := p.AndroidMk() data.fillInData(ctx, mod) diff --git a/android/vintf_fragment_test.go b/android/vintf_fragment_test.go index cd90b986c..cb038f5ad 100644 --- a/android/vintf_fragment_test.go +++ b/android/vintf_fragment_test.go @@ -31,6 +31,6 @@ func TestVintfManifestBuildAction(t *testing.T) { vintfFragmentBuild := testResult.TestContext.ModuleForTests("test_vintf_fragment", "android_common").Rule("assemble_vintf") if !strings.Contains(vintfFragmentBuild.RuleParams.Command, "assemble_vintf") { - t.Errorf("Vintf_manifest build command does not process with assemble_vintf : " + vintfFragmentBuild.RuleParams.Command) + t.Error("Vintf_manifest build command does not process with assemble_vintf : " + vintfFragmentBuild.RuleParams.Command) } } |