diff options
-rw-r--r-- | android/namespace_test.go | 11 | ||||
-rw-r--r-- | android/prebuilt_test.go | 13 | ||||
-rw-r--r-- | android/testing.go | 11 | ||||
-rw-r--r-- | cc/cc_test.go | 13 | ||||
-rw-r--r-- | cc/test_data_test.go | 13 | ||||
-rw-r--r-- | java/java_test.go | 14 | ||||
-rw-r--r-- | python/python_test.go | 13 |
7 files changed, 22 insertions, 66 deletions
diff --git a/android/namespace_test.go b/android/namespace_test.go index a6fc9d59..8bec0add 100644 --- a/android/namespace_test.go +++ b/android/namespace_test.go @@ -628,7 +628,7 @@ func setupTestExpectErrs(bps map[string]string) (ctx *TestContext, errs []error) func setupTest(t *testing.T, bps map[string]string) (ctx *TestContext) { ctx, errs := setupTestExpectErrs(bps) - failIfErrored(t, errs) + FailIfErrored(t, errs) return ctx } @@ -692,12 +692,3 @@ func newTestModule() Module { InitAndroidModule(m) return m } - -func failIfErrored(t *testing.T, errs []error) { - if len(errs) > 0 { - for _, err := range errs { - t.Error(err) - } - t.FailNow() - } -} diff --git a/android/prebuilt_test.go b/android/prebuilt_test.go index 93f58053..69ce16a3 100644 --- a/android/prebuilt_test.go +++ b/android/prebuilt_test.go @@ -138,9 +138,9 @@ func TestPrebuilts(t *testing.T) { }) _, errs := ctx.ParseBlueprintsFiles("Blueprints") - fail(t, errs) + FailIfErrored(t, errs) _, errs = ctx.PrepareBuildActions(config) - fail(t, errs) + FailIfErrored(t, errs) foo := ctx.ModuleForTests("foo", "") @@ -231,12 +231,3 @@ func (s *sourceModule) DepsMutator(ctx BottomUpMutatorContext) { func (s *sourceModule) GenerateAndroidBuildActions(ctx ModuleContext) { } - -func fail(t *testing.T, errs []error) { - if len(errs) > 0 { - for _, err := range errs { - t.Error(err) - } - t.FailNow() - } -} diff --git a/android/testing.go b/android/testing.go index ae012b06..6e80c532 100644 --- a/android/testing.go +++ b/android/testing.go @@ -18,6 +18,7 @@ import ( "fmt" "path/filepath" "strings" + "testing" "github.com/google/blueprint" ) @@ -152,3 +153,13 @@ func (m TestingModule) Output(file string) BuildParams { panic(fmt.Errorf("couldn't find output %q.\nall outputs: %v", file, searchedOutputs)) } + +func FailIfErrored(t *testing.T, errs []error) { + t.Helper() + if len(errs) > 0 { + for _, err := range errs { + t.Error(err) + } + t.FailNow() + } +} diff --git a/cc/cc_test.go b/cc/cc_test.go index 19e4703b..63296056 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -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 { diff --git a/cc/test_data_test.go b/cc/test_data_test.go index 434edcdf..4a7b0f75 100644 --- a/cc/test_data_test.go +++ b/cc/test_data_test.go @@ -135,9 +135,9 @@ func TestDataTests(t *testing.T) { ctx.Register() _, errs := ctx.ParseBlueprintsFiles("Blueprints") - fail(t, errs) + android.FailIfErrored(t, errs) _, errs = ctx.PrepareBuildActions(config) - fail(t, errs) + android.FailIfErrored(t, errs) foo := ctx.ModuleForTests("foo", "") @@ -186,12 +186,3 @@ func (test *testDataTest) DepsMutator(ctx android.BottomUpMutatorContext) { func (test *testDataTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { test.data = ctx.ExpandSources(test.Properties.Data, nil) } - -func fail(t *testing.T, errs []error) { - if len(errs) > 0 { - for _, err := range errs { - t.Error(err) - } - t.FailNow() - } -} 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() - } -} diff --git a/python/python_test.go b/python/python_test.go index 176c6eca..ad80167e 100644 --- a/python/python_test.go +++ b/python/python_test.go @@ -347,7 +347,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)...) @@ -360,7 +360,7 @@ func TestPythonModule(t *testing.T) { e.parSpec, e.depsParSpecs)...) } } - fail(t, testErrs) + android.FailIfErrored(t, testErrs) }) } } @@ -458,12 +458,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() - } -} |