Extract failIfErrored() to android/testing.go

Bug: 74506774
Test: lunch aosp_walleye-userdebug && make  # runs unit tests
Change-Id: I1c09412d5988dca2cc1c5f041893b313ab1c163a
This commit is contained in:
Logan Chien
2018-03-12 16:29:17 +08:00
parent 9c6bc37da1
commit 4203971351
7 changed files with 22 additions and 66 deletions

View File

@@ -147,9 +147,9 @@ func testCcWithConfig(t *testing.T, bp string, config android.Config) *android.T
ctx := createTestContext(t, config, bp)
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
failIfErrored(t, errs)
android.FailIfErrored(t, errs)
_, errs = ctx.PrepareBuildActions(config)
failIfErrored(t, errs)
android.FailIfErrored(t, errs)
return ctx
}
@@ -1064,15 +1064,6 @@ func TestLinkReordering(t *testing.T) {
}
}
func failIfErrored(t *testing.T, errs []error) {
if len(errs) > 0 {
for _, err := range errs {
t.Error(err)
}
t.FailNow()
}
}
func failIfNoMatchingErrors(t *testing.T, pattern string, errs []error) {
matcher, err := regexp.Compile(pattern)
if err != nil {