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

Commit 74135582 authored Oct 06, 2022 by Paul Duffin

Add Config,RunningInsideUnitTest

Sometimes it is necessary for some functionality to be disabled while
running in unit tests, e.g. functionality that requires external
information such as error prone tools and configuration. Sometimes it
is necessary for some functionality to be enabled while running in
unit tests, e.g. functionality that makes state available for
testing but which is not necessary at runtime.

Previously, that was done by checking to see if TestProductVariables
was nil. This change adds a method to abstract that.

Bug: 245956352
Test: m nothing
Change-Id: I7845b79328e7180623161a9bf897568089da4e4f

parent de13a3a2

android/config.go

+5 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,11 @@ func (c Config) PrimaryBuilderInvocations() []bootstrap.PrimaryBuilderInvocation
		return []bootstrap.PrimaryBuilderInvocation{}
		}

		// RunningInsideUnitTest returns true if this code is being run as part of a Soong unit test.
		func (c Config) RunningInsideUnitTest() bool {
		return c.config.TestProductVariables != nil
		}

		// A DeviceConfig object represents the configuration for a particular device
		// being built. For now there will only be one of these, but in the future there
		// may be multiple devices being built.

java/base.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -893,7 +893,7 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB

		epEnabled := j.properties.Errorprone.Enabled
		if (ctx.Config().RunErrorProne() && epEnabled == nil) \|\| Bool(epEnabled) {
		if config.ErrorProneClasspath == nil && ctx.Config().TestProductVariables == nil {
		if config.ErrorProneClasspath == nil && !ctx.Config().RunningInsideUnitTest() {
		ctx.ModuleErrorf("cannot build with Error Prone, missing external/error_prone?")
		}