From c7d1644b0bc5281c8f1a6c19bb071527e7628b9f Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 23 Apr 2021 13:55:49 +0100 Subject: Add coverage specific properties to bootclasspath_fragment This allows a bootclasspath_fragment (specifically the art-bootclasspath-fragment) to specify additional contents to be appended when coverage is enabled. The art-bootclasspath-fragment will use this to add jacocoagent to its contents to ensure that it is always consistent with the configuration. Bug: 177892522 Test: m nothing Change-Id: I50d05fe5e0e9b8c14bdf3dfd63bba0ac97e31d48 --- java/bootclasspath_fragment_test.go | 59 +++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'java/bootclasspath_fragment_test.go') diff --git a/java/bootclasspath_fragment_test.go b/java/bootclasspath_fragment_test.go index 524a2269b..0db93619c 100644 --- a/java/bootclasspath_fragment_test.go +++ b/java/bootclasspath_fragment_test.go @@ -125,3 +125,62 @@ func TestBootclasspathFragmentWithImageNameAndContents(t *testing.T) { } `) } + +func TestBootclasspathFragment_Coverage(t *testing.T) { + prepareForTestWithFrameworkCoverage := android.FixtureMergeEnv(map[string]string{ + "EMMA_INSTRUMENT": "true", + "EMMA_INSTRUMENT_FRAMEWORK": "true", + }) + + prepareWithBp := android.FixtureWithRootAndroidBp(` + bootclasspath_fragment { + name: "myfragment", + contents: [ + "mybootlib", + ], + coverage: { + contents: [ + "coveragelib", + ], + }, + } + + java_library { + name: "mybootlib", + srcs: ["Test.java"], + system_modules: "none", + sdk_version: "none", + compile_dex: true, + } + + java_library { + name: "coveragelib", + srcs: ["Test.java"], + system_modules: "none", + sdk_version: "none", + compile_dex: true, + } + `) + + checkContents := func(t *testing.T, result *android.TestResult, expected ...string) { + module := result.Module("myfragment", "android_common").(*BootclasspathFragmentModule) + android.AssertArrayString(t, "contents property", expected, module.properties.Contents) + } + + t.Run("without coverage", func(t *testing.T) { + result := android.GroupFixturePreparers( + prepareForTestWithBootclasspathFragment, + prepareWithBp, + ).RunTest(t) + checkContents(t, result, "mybootlib") + }) + + t.Run("with coverage", func(t *testing.T) { + result := android.GroupFixturePreparers( + prepareForTestWithBootclasspathFragment, + prepareForTestWithFrameworkCoverage, + prepareWithBp, + ).RunTest(t) + checkContents(t, result, "mybootlib", "coveragelib") + }) +} -- cgit v1.2.3-59-g8ed1b