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

Merge "Fix Errorf format string for error"

Browse Source
This commit is contained in:
Treehugger Robot
2022-10-06 17:43:07 +00:00
committed by Gerrit Code Review
parent 5b0bba9ff5 7a11dc8689
commit e81503e161
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/testing.go
View File

@@ -739,12 +739,13 @@ func AssertExcludeFromRecoverySnapshotIs(t *testing.T, ctx *android.TestContext,
} }
func checkOverrides(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, jsonPath string, expected []string) { func checkOverrides(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, jsonPath string, expected []string) {
t.Helper()
out := singleton.MaybeOutput(jsonPath) out := singleton.MaybeOutput(jsonPath)
content := android.ContentFromFileRuleForTests(t, out) content := android.ContentFromFileRuleForTests(t, out)
var flags snapshotJsonFlags var flags snapshotJsonFlags
if err := json.Unmarshal([]byte(content), &flags); err != nil { if err := json.Unmarshal([]byte(content), &flags); err != nil {
t.Errorf("Error while unmarshalling json %q: %w", jsonPath, err) t.Errorf("Error while unmarshalling json %q: %s", jsonPath, err.Error())
return return
} }