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

Commit 89aa0f71 authored by Spandan Das's avatar Spandan Das
Browse files

Do not convert soong's tests in bp2build 

These tests cannot be run with b since it uses functions that should not be
used outside tests, and it enforces this by looking at os.Args. Since
the pattern (`-test`) is missing in os.Args, these tests panic in b.

A module can be a dep of soong_build via two mechanisms
1. Listed in deps explicitly
2. Via plugin_for to create a reverse dep

This CL denylists (1) explicitly. e.g. soong-android. Another option
would have been to denylist by using Deps() of soong-build, but that
would denylist `golang-protobuf-proto` as well

This CL denylists (2) programmatically.

Note that this CL only denylists creation of the `go_test` target. We
will still create `go_binary` and `go_library` for soong since there
might be tools that depend on soong.
e.g.
```
--> depends on
dexpreot_gen --> soong-dexpreopt --> soong-android (test failure)
```

(The above example means that we might need to convert _some_ of soong
after all, but we can refactor the common bits to common utils. Keeping
this out of scope for now).

Test: b test //build/soong/... //system/tools/...
too)
Bug: 284483729

Change-Id: I809012bdd383febca30da95e991edfde5fd4d9b9
parent 682e7868

bp2build/build_conversion.go

+17 −2
Original line number Diff line number Diff line
@@ -438,6 +438,21 @@ var ( 
	}

)



func testOfGoPackageIsIncompatible(g *bootstrap.GoPackage) bool {

	return android.InList(g.Name(), goTestsDenylist) ||

		// Denylist tests of soong_build

		// Theses tests have a guard that prevent usage outside a test environment

		// The guard (`ensureTestOnly`) looks for a `-test` in os.Args, which is present in soong's gotestrunner, but missing in `b test`

		g.IsPluginFor("soong_build") ||

		// soong-android is a dep of soong_build

		// This dependency is created by soong_build by listing it in its deps explicitly in Android.bp, and not via `plugin_for` in `soong-android`

		g.Name() == "soong-android"

}



func testOfGoBinaryIsIncompatible(g *bootstrap.GoBinary) bool {

	return android.InList(g.Name(), goTestsDenylist)

}



func generateBazelTargetsGoPackage(ctx *android.Context, g *bootstrap.GoPackage, goModulesMap nameToGoLibraryModule) ([]BazelTarget, []error) {

	ca := android.CommonAttributes{

		Name: g.Name(),
@@ -481,7 +496,7 @@ func generateBazelTargetsGoPackage(ctx *android.Context, g *bootstrap.GoPackage, 
	}



	// If the library contains test srcs, create an additional go_test target

	if !android.InList(g.Name(), goTestsDenylist) && (len(g.TestSrcs()) > 0 || len(g.LinuxTestSrcs()) > 0 || len(g.DarwinTestSrcs()) > 0) {

	if !testOfGoPackageIsIncompatible(g) && (len(g.TestSrcs()) > 0 || len(g.LinuxTestSrcs()) > 0 || len(g.DarwinTestSrcs()) > 0) {

		gp := goTestProperties{

			name:           g.Name() + "-test",

			dir:            ctx.ModuleDir(g),
@@ -559,7 +574,7 @@ func generateBazelTargetsGoBinary(ctx *android.Context, g *bootstrap.GoBinary, g 
	goSource := ""

	// If the library contains test srcs, create an additional go_test target

	// The go_test target will embed a go_source containining the source .go files it tests

	if !android.InList(g.Name(), goTestsDenylist) && (len(g.TestSrcs()) > 0 || len(g.LinuxTestSrcs()) > 0 || len(g.DarwinTestSrcs()) > 0) {

	if !testOfGoBinaryIsIncompatible(g) && (len(g.TestSrcs()) > 0 || len(g.LinuxTestSrcs()) > 0 || len(g.DarwinTestSrcs()) > 0) {

		// Create a go_source containing the source .go files of go_library

		// This target will be an `embed` of the go_binary and go_test

		goSource = g.Name() + "-source"