diff options
| author | Logan Chien <loganchien@google.com> | 2018-03-12 16:29:17 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2018-03-16 17:45:42 +0800 |
| commit | d44aa3b5c8afbfeb66e39668bab3ec0fac63f1e6 (patch) | |
| tree | f9bd69ac0212653911565c8491d42616b1467bcd /java | |
| parent | 3985402d74c7743724daecfc68dc10388cb870d9 (diff) | |
| download | build_soong-d44aa3b5c8afbfeb66e39668bab3ec0fac63f1e6.tar.gz build_soong-d44aa3b5c8afbfeb66e39668bab3ec0fac63f1e6.tar.bz2 build_soong-d44aa3b5c8afbfeb66e39668bab3ec0fac63f1e6.zip | |
Extract failIfErrored() to android/testing.go
Bug: 74506774
Test: lunch aosp_walleye-userdebug && make # runs unit tests
Merged-In: I1c09412d5988dca2cc1c5f041893b313ab1c163a
Change-Id: I1c09412d5988dca2cc1c5f041893b313ab1c163a
Diffstat (limited to 'java')
| -rw-r--r-- | java/java_test.go | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/java/java_test.go b/java/java_test.go index 5d6a6e0e..6ef406f7 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -190,9 +190,9 @@ func testContext(config android.Config, bp string, func run(t *testing.T, ctx *android.TestContext, config android.Config) { t.Helper() _, errs := ctx.ParseFileList(".", []string{"Android.bp"}) - fail(t, errs) + android.FailIfErrored(t, errs) _, errs = ctx.PrepareBuildActions(config) - fail(t, errs) + android.FailIfErrored(t, errs) } func testJava(t *testing.T, bp string) *android.TestContext { @@ -977,13 +977,3 @@ func TestExcludeFileGroupInSrcs(t *testing.T) { t.Errorf(`foo inputs %v != ["java-fg/c.java"]`, javac.Inputs) } } - -func fail(t *testing.T, errs []error) { - t.Helper() - if len(errs) > 0 { - for _, err := range errs { - t.Error(err) - } - t.FailNow() - } -} |