StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move some implicitly shared testing code for bp2build into testing.go.

Browse Source 
Test: go test
Change-Id: I403d703184e517dbffbdccb8007229cad00858c1
This commit is contained in:
Rupert Shuttleworth
2021-05-19 09:14:26 -04:00
parent b81b29c2f6
commit 06559d07cb
9 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bp2build/build_conversion_test.go
View File

@@ -324,11 +324,11 @@ custom {
ctx.RegisterForBazelConversion()
_, errs := ctx.ParseFileList(dir, []string{"Android.bp"})
if Errored(t, "", errs) {
if errored(t, "", errs) {
continue
}
_, errs = ctx.ResolveDependencies(config)
if Errored(t, "", errs) {
if errored(t, "", errs) {
continue
}
@@ -925,11 +925,11 @@ genrule {
ctx.RegisterForBazelConversion()
_, errs := ctx.ParseFileList(dir, toParse)
if Errored(t, testCase.description, errs) {
if errored(t, testCase.description, errs) {
continue
}
_, errs = ctx.ResolveDependencies(config)
if Errored(t, testCase.description, errs) {
if errored(t, testCase.description, errs) {
continue
}
@@ -957,17 +957,6 @@ genrule {
}
}
func Errored(t *testing.T, desc string, errs []error) bool {
t.Helper()
if len(errs) > 0 {
for _, err := range errs {
t.Errorf("%s: %s", desc, err)
}
return true
}
return false
}
type bp2buildMutator = func(android.TopDownMutatorContext)
func TestBp2BuildInlinesDefaults(t *testing.T) {
@@ -1483,11 +1472,11 @@ filegroup {
ctx.RegisterForBazelConversion()
_, errs := ctx.ParseFileList(dir, toParse)
if Errored(t, testCase.description, errs) {
if errored(t, testCase.description, errs) {
continue
}
_, errs = ctx.ResolveDependencies(config)
if Errored(t, testCase.description, errs) {
if errored(t, testCase.description, errs) {
continue
}
@@ -1606,11 +1595,11 @@ func TestGlobExcludeSrcs(t *testing.T) {
ctx.RegisterForBazelConversion()
_, errs := ctx.ParseFileList(dir, toParse)
if Errored(t, testCase.description, errs) {
if errored(t, testCase.description, errs) {
continue
}
_, errs = ctx.ResolveDependencies(config)
if Errored(t, testCase.description, errs) {
if errored(t, testCase.description, errs) {
continue
}