diff options
| author | Logan Chien <loganchien@google.com> | 2018-03-12 16:29:17 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2018-03-15 11:02:38 +0800 |
| commit | 4203971351ac8701c00c05252839221d13fbf3d0 (patch) | |
| tree | 1ac57bf84e9a7ca349a79e9b072c6a46076a7b55 /python | |
| parent | 9c6bc37da1dd47ff61e324f2b477e9e3d7a98a99 (diff) | |
| download | build_soong-4203971351ac8701c00c05252839221d13fbf3d0.tar.gz build_soong-4203971351ac8701c00c05252839221d13fbf3d0.tar.bz2 build_soong-4203971351ac8701c00c05252839221d13fbf3d0.zip | |
Extract failIfErrored() to android/testing.go
Bug: 74506774
Test: lunch aosp_walleye-userdebug && make # runs unit tests
Change-Id: I1c09412d5988dca2cc1c5f041893b313ab1c163a
Diffstat (limited to 'python')
| -rw-r--r-- | python/python_test.go | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/python/python_test.go b/python/python_test.go index 67b19827..9ef6cb09 100644 --- a/python/python_test.go +++ b/python/python_test.go @@ -342,7 +342,7 @@ func TestPythonModule(t *testing.T) { ctx.Register() ctx.MockFileSystem(d.mockFiles) _, testErrs := ctx.ParseBlueprintsFiles(bpFile) - fail(t, testErrs) + android.FailIfErrored(t, testErrs) _, actErrs := ctx.PrepareBuildActions(config) if len(actErrs) > 0 { testErrs = append(testErrs, expectErrors(t, actErrs, d.errors)...) @@ -356,7 +356,7 @@ func TestPythonModule(t *testing.T) { e.depsSrcsZips)...) } } - fail(t, testErrs) + android.FailIfErrored(t, testErrs) }) } } @@ -442,12 +442,3 @@ func setupBuildEnv(t *testing.T) (config android.Config, buildDir string) { func tearDownBuildEnv(buildDir string) { os.RemoveAll(buildDir) } - -func fail(t *testing.T, errs []error) { - if len(errs) > 0 { - for _, err := range errs { - t.Error(err) - } - t.FailNow() - } -} |