Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d44aa3b5 authored by Logan Chien's avatar Logan Chien
Browse files

Extract failIfErrored() to android/testing.go 

Bug: 74506774
Test: lunch aosp_walleye-userdebug && make  # runs unit tests

Merged-In: I1c09412d5988dca2cc1c5f041893b313ab1c163a
Change-Id: I1c09412d5988dca2cc1c5f041893b313ab1c163a
parent 3985402d

android/namespace_test.go

+1 −10
Original line number Diff line number Diff line
@@ -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()

	}

}

android/prebuilt_test.go

+2 −11
Original line number Diff line number Diff line
@@ -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()

	}

}

android/testing.go

+11 −0
Original line number Diff line number Diff line
@@ -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()

	}

}

cc/cc_test.go

+2 −11
Original line number Diff line number Diff line
@@ -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 {

cc/test_data_test.go

+2 −11
Original line number Diff line number Diff line
@@ -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()

	}

}