Add android_ravenwood_test build rule
Modeled after android_robolectric_test. Bug: 292141694 Test: m nothing --no-skip-soong-tests Test: m hoststubgen ravenwood-runtime tradefed atest && atest-dev HostStubGenTest-framework-test Merged-in: Ibef8953db45b86264c8a827868793b42f8f2d6ab Change-Id: Ibef8953db45b86264c8a827868793b42f8f2d6ab
This commit is contained in:
Makoto Onuki
parent
55a829d74c
commit
4a9869d066
5 changed files with 325 additions and 1 deletions
|
|
@ -24,6 +24,7 @@ func testSuiteFilesFactory() Singleton {
|
|||
|
||||
type testSuiteFiles struct {
|
||||
robolectric WritablePath
|
||||
ravenwood WritablePath
|
||||
}
|
||||
|
||||
type TestSuiteModule interface {
|
||||
|
|
@ -47,12 +48,15 @@ func (t *testSuiteFiles) GenerateBuildActions(ctx SingletonContext) {
|
|||
})
|
||||
|
||||
t.robolectric = robolectricTestSuite(ctx, files["robolectric-tests"])
|
||||
|
||||
ctx.Phony("robolectric-tests", t.robolectric)
|
||||
|
||||
t.ravenwood = ravenwoodTestSuite(ctx, files["ravenwood-tests"])
|
||||
ctx.Phony("ravenwood-tests", t.ravenwood)
|
||||
}
|
||||
|
||||
func (t *testSuiteFiles) MakeVars(ctx MakeVarsContext) {
|
||||
ctx.DistForGoal("robolectric-tests", t.robolectric)
|
||||
ctx.DistForGoal("ravenwood-tests", t.ravenwood)
|
||||
}
|
||||
|
||||
func robolectricTestSuite(ctx SingletonContext, files map[string]InstallPaths) WritablePath {
|
||||
|
|
@ -74,3 +78,23 @@ func robolectricTestSuite(ctx SingletonContext, files map[string]InstallPaths) W
|
|||
|
||||
return outputFile
|
||||
}
|
||||
|
||||
func ravenwoodTestSuite(ctx SingletonContext, files map[string]InstallPaths) WritablePath {
|
||||
var installedPaths InstallPaths
|
||||
for _, module := range SortedKeys(files) {
|
||||
installedPaths = append(installedPaths, files[module]...)
|
||||
}
|
||||
testCasesDir := pathForInstall(ctx, ctx.Config().BuildOS, X86, "testcases")
|
||||
|
||||
outputFile := PathForOutput(ctx, "packaging", "ravenwood-tests.zip")
|
||||
rule := NewRuleBuilder(pctx, ctx)
|
||||
rule.Command().BuiltTool("soong_zip").
|
||||
FlagWithOutput("-o ", outputFile).
|
||||
FlagWithArg("-P ", "host/testcases").
|
||||
FlagWithArg("-C ", testCasesDir.String()).
|
||||
FlagWithRspFileInputList("-r ", outputFile.ReplaceExtension(ctx, "rsp"), installedPaths.Paths()).
|
||||
Flag("-sha256")
|
||||
rule.Build("ravenwood_tests_zip", "ravenwood-tests.zip")
|
||||
|
||||
return outputFile
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ bootstrap_go_package {
|
|||
"plugin.go",
|
||||
"prebuilt_apis.go",
|
||||
"proto.go",
|
||||
"ravenwood.go",
|
||||
"robolectric.go",
|
||||
"rro.go",
|
||||
"sdk.go",
|
||||
|
|
@ -107,6 +108,7 @@ bootstrap_go_package {
|
|||
"plugin_test.go",
|
||||
"prebuilt_apis_test.go",
|
||||
"proto_test.go",
|
||||
"ravenwood_test.go",
|
||||
"rro_test.go",
|
||||
"sdk_library_test.go",
|
||||
"sdk_test.go",
|
||||
|
|
|
|||
184
java/ravenwood.go
Normal file
184
java/ravenwood.go
Normal file
|
|
@ -0,0 +1,184 @@
|
|||
// Copyright 2023 Google Inc. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
package java
|
||||
|
||||
import (
|
||||
"android/soong/android"
|
||||
"android/soong/tradefed"
|
||||
|
||||
"github.com/google/blueprint/proptools"
|
||||
)
|
||||
|
||||
func init() {
|
||||
RegisterRavenwoodBuildComponents(android.InitRegistrationContext)
|
||||
}
|
||||
|
||||
func RegisterRavenwoodBuildComponents(ctx android.RegistrationContext) {
|
||||
ctx.RegisterModuleType("android_ravenwood_test", ravenwoodTestFactory)
|
||||
ctx.RegisterModuleType("android_ravenwood_libgroup", ravenwoodLibgroupFactory)
|
||||
}
|
||||
|
||||
var ravenwoodTag = dependencyTag{name: "ravenwood"}
|
||||
|
||||
const ravenwoodUtilsName = "ravenwood-utils"
|
||||
const ravenwoodRuntimeName = "ravenwood-runtime"
|
||||
|
||||
type ravenwoodTest struct {
|
||||
Library
|
||||
|
||||
testProperties testProperties
|
||||
testConfig android.Path
|
||||
|
||||
forceOSType android.OsType
|
||||
forceArchType android.ArchType
|
||||
}
|
||||
|
||||
func ravenwoodTestFactory() android.Module {
|
||||
module := &ravenwoodTest{}
|
||||
|
||||
module.addHostAndDeviceProperties()
|
||||
module.AddProperties(&module.testProperties)
|
||||
|
||||
module.Module.dexpreopter.isTest = true
|
||||
module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true)
|
||||
|
||||
module.testProperties.Test_suites = []string{"ravenwood-tests"}
|
||||
module.testProperties.Test_options.Unit_test = proptools.BoolPtr(false)
|
||||
|
||||
InitJavaModule(module, android.DeviceSupported)
|
||||
android.InitDefaultableModule(module)
|
||||
|
||||
return module
|
||||
}
|
||||
|
||||
func (r *ravenwoodTest) InstallInTestcases() bool { return true }
|
||||
func (r *ravenwoodTest) InstallForceOS() (*android.OsType, *android.ArchType) {
|
||||
return &r.forceOSType, &r.forceArchType
|
||||
}
|
||||
func (r *ravenwoodTest) TestSuites() []string {
|
||||
return r.testProperties.Test_suites
|
||||
}
|
||||
|
||||
func (r *ravenwoodTest) DepsMutator(ctx android.BottomUpMutatorContext) {
|
||||
r.Library.DepsMutator(ctx)
|
||||
|
||||
// Generically depend on the runtime so that it's installed together with us
|
||||
ctx.AddVariationDependencies(nil, ravenwoodTag, ravenwoodRuntimeName)
|
||||
|
||||
// Directly depend on any utils so that we link against them
|
||||
utils := ctx.AddVariationDependencies(nil, ravenwoodTag, ravenwoodUtilsName)[0]
|
||||
if utils != nil {
|
||||
for _, lib := range utils.(*ravenwoodLibgroup).ravenwoodLibgroupProperties.Libs {
|
||||
ctx.AddVariationDependencies(nil, libTag, lib)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (r *ravenwoodTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
r.forceOSType = ctx.Config().BuildOS
|
||||
r.forceArchType = ctx.Config().BuildArch
|
||||
|
||||
r.testConfig = tradefed.AutoGenTestConfig(ctx, tradefed.AutoGenTestConfigOptions{
|
||||
TestConfigProp: r.testProperties.Test_config,
|
||||
TestConfigTemplateProp: r.testProperties.Test_config_template,
|
||||
TestSuites: r.testProperties.Test_suites,
|
||||
AutoGenConfig: r.testProperties.Auto_gen_config,
|
||||
DeviceTemplate: "${RavenwoodTestConfigTemplate}",
|
||||
HostTemplate: "${RavenwoodTestConfigTemplate}",
|
||||
})
|
||||
|
||||
r.Library.GenerateAndroidBuildActions(ctx)
|
||||
|
||||
// Start by depending on all files installed by dependancies
|
||||
var installDeps android.InstallPaths
|
||||
for _, dep := range ctx.GetDirectDepsWithTag(ravenwoodTag) {
|
||||
for _, installFile := range dep.FilesToInstall() {
|
||||
installDeps = append(installDeps, installFile)
|
||||
}
|
||||
}
|
||||
|
||||
// Also depend on our config
|
||||
installPath := android.PathForModuleInstall(ctx, r.BaseModuleName())
|
||||
installConfig := ctx.InstallFile(installPath, ctx.ModuleName()+".config", r.testConfig)
|
||||
installDeps = append(installDeps, installConfig)
|
||||
|
||||
// Finally install our JAR with all dependencies
|
||||
ctx.InstallFile(installPath, ctx.ModuleName()+".jar", r.outputFile, installDeps...)
|
||||
}
|
||||
|
||||
func (r *ravenwoodTest) AndroidMkEntries() []android.AndroidMkEntries {
|
||||
entriesList := r.Library.AndroidMkEntries()
|
||||
entries := &entriesList[0]
|
||||
entries.ExtraEntries = append(entries.ExtraEntries,
|
||||
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
|
||||
entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true)
|
||||
entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", "ravenwood-tests")
|
||||
if r.testConfig != nil {
|
||||
entries.SetPath("LOCAL_FULL_TEST_CONFIG", r.testConfig)
|
||||
}
|
||||
})
|
||||
return entriesList
|
||||
}
|
||||
|
||||
type ravenwoodLibgroupProperties struct {
|
||||
Libs []string
|
||||
}
|
||||
|
||||
type ravenwoodLibgroup struct {
|
||||
android.ModuleBase
|
||||
|
||||
ravenwoodLibgroupProperties ravenwoodLibgroupProperties
|
||||
|
||||
forceOSType android.OsType
|
||||
forceArchType android.ArchType
|
||||
}
|
||||
|
||||
func ravenwoodLibgroupFactory() android.Module {
|
||||
module := &ravenwoodLibgroup{}
|
||||
module.AddProperties(&module.ravenwoodLibgroupProperties)
|
||||
|
||||
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
|
||||
return module
|
||||
}
|
||||
|
||||
func (r *ravenwoodLibgroup) InstallInTestcases() bool { return true }
|
||||
func (r *ravenwoodLibgroup) InstallForceOS() (*android.OsType, *android.ArchType) {
|
||||
return &r.forceOSType, &r.forceArchType
|
||||
}
|
||||
func (r *ravenwoodLibgroup) TestSuites() []string {
|
||||
return []string{"ravenwood-tests"}
|
||||
}
|
||||
|
||||
func (r *ravenwoodLibgroup) DepsMutator(ctx android.BottomUpMutatorContext) {
|
||||
// Always depends on our underlying libs
|
||||
for _, lib := range r.ravenwoodLibgroupProperties.Libs {
|
||||
ctx.AddVariationDependencies(nil, ravenwoodTag, lib)
|
||||
}
|
||||
}
|
||||
|
||||
func (r *ravenwoodLibgroup) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
r.forceOSType = ctx.Config().BuildOS
|
||||
r.forceArchType = ctx.Config().BuildArch
|
||||
|
||||
// Install our runtime into expected location for packaging
|
||||
installPath := android.PathForModuleInstall(ctx, r.BaseModuleName())
|
||||
for _, lib := range r.ravenwoodLibgroupProperties.Libs {
|
||||
libModule := ctx.GetDirectDepWithTag(lib, ravenwoodTag)
|
||||
libJar := android.OutputFileForModule(ctx, libModule, "")
|
||||
ctx.InstallFile(installPath, lib+".jar", libJar)
|
||||
}
|
||||
|
||||
// Normal build should perform install steps
|
||||
ctx.Phony(r.BaseModuleName(), android.PathForPhony(ctx, r.BaseModuleName()+"-install"))
|
||||
}
|
||||
113
java/ravenwood_test.go
Normal file
113
java/ravenwood_test.go
Normal file
|
|
@ -0,0 +1,113 @@
|
|||
// Copyright 2022 Google Inc. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package java
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"android/soong/android"
|
||||
)
|
||||
|
||||
var prepareRavenwoodRuntime = android.GroupFixturePreparers(
|
||||
android.FixtureRegisterWithContext(func(ctx android.RegistrationContext) {
|
||||
RegisterRavenwoodBuildComponents(ctx)
|
||||
}),
|
||||
android.FixtureAddTextFile("ravenwood/Android.bp", `
|
||||
java_library_static {
|
||||
name: "framework-minus-apex.ravenwood",
|
||||
srcs: ["Framework.java"],
|
||||
}
|
||||
java_library_static {
|
||||
name: "framework-services.ravenwood",
|
||||
srcs: ["Services.java"],
|
||||
}
|
||||
java_library_static {
|
||||
name: "framework-rules.ravenwood",
|
||||
srcs: ["Rules.java"],
|
||||
}
|
||||
android_ravenwood_libgroup {
|
||||
name: "ravenwood-runtime",
|
||||
libs: [
|
||||
"framework-minus-apex.ravenwood",
|
||||
"framework-services.ravenwood",
|
||||
],
|
||||
}
|
||||
android_ravenwood_libgroup {
|
||||
name: "ravenwood-utils",
|
||||
libs: [
|
||||
"framework-rules.ravenwood",
|
||||
],
|
||||
}
|
||||
`),
|
||||
)
|
||||
|
||||
var installPathPrefix = "out/soong/host/linux-x86/testcases"
|
||||
|
||||
func TestRavenwoodRuntime(t *testing.T) {
|
||||
ctx := android.GroupFixturePreparers(
|
||||
PrepareForIntegrationTestWithJava,
|
||||
prepareRavenwoodRuntime,
|
||||
).RunTest(t)
|
||||
|
||||
// Verify that our runtime depends on underlying libs
|
||||
CheckModuleHasDependency(t, ctx.TestContext, "ravenwood-runtime", "android_common", "framework-minus-apex.ravenwood")
|
||||
CheckModuleHasDependency(t, ctx.TestContext, "ravenwood-runtime", "android_common", "framework-services.ravenwood")
|
||||
CheckModuleHasDependency(t, ctx.TestContext, "ravenwood-utils", "android_common", "framework-rules.ravenwood")
|
||||
|
||||
// Verify that we've emitted artifacts in expected location
|
||||
runtime := ctx.ModuleForTests("ravenwood-runtime", "android_common")
|
||||
runtime.Output(installPathPrefix + "/ravenwood-runtime/framework-minus-apex.ravenwood.jar")
|
||||
runtime.Output(installPathPrefix + "/ravenwood-runtime/framework-services.ravenwood.jar")
|
||||
utils := ctx.ModuleForTests("ravenwood-utils", "android_common")
|
||||
utils.Output(installPathPrefix + "/ravenwood-utils/framework-rules.ravenwood.jar")
|
||||
}
|
||||
|
||||
func TestRavenwoodTest(t *testing.T) {
|
||||
ctx := android.GroupFixturePreparers(
|
||||
PrepareForIntegrationTestWithJava,
|
||||
prepareRavenwoodRuntime,
|
||||
).RunTestWithBp(t, `
|
||||
android_ravenwood_test {
|
||||
name: "ravenwood-test",
|
||||
srcs: ["Test.java"],
|
||||
sdk_version: "test_current",
|
||||
}
|
||||
`)
|
||||
|
||||
// Verify that our test depends on underlying libs
|
||||
CheckModuleHasDependency(t, ctx.TestContext, "ravenwood-test", "android_common", "ravenwood-buildtime")
|
||||
CheckModuleHasDependency(t, ctx.TestContext, "ravenwood-test", "android_common", "ravenwood-utils")
|
||||
|
||||
module := ctx.ModuleForTests("ravenwood-test", "android_common")
|
||||
classpath := module.Rule("javac").Args["classpath"]
|
||||
|
||||
// Verify that we're linking against test_current
|
||||
android.AssertStringDoesContain(t, "classpath", classpath, "android_test_stubs_current.jar")
|
||||
// Verify that we're linking against utils
|
||||
android.AssertStringDoesContain(t, "classpath", classpath, "framework-rules.ravenwood.jar")
|
||||
// Verify that we're *NOT* linking against runtime
|
||||
android.AssertStringDoesNotContain(t, "classpath", classpath, "framework-minus-apex.ravenwood.jar")
|
||||
android.AssertStringDoesNotContain(t, "classpath", classpath, "framework-services.ravenwood.jar")
|
||||
|
||||
// Verify that we've emitted test artifacts in expected location
|
||||
outputJar := module.Output(installPathPrefix + "/ravenwood-test/ravenwood-test.jar")
|
||||
module.Output(installPathPrefix + "/ravenwood-test/ravenwood-test.config")
|
||||
|
||||
// Verify that we're going to install underlying libs
|
||||
orderOnly := outputJar.OrderOnly.Strings()
|
||||
android.AssertStringListContains(t, "orderOnly", orderOnly, installPathPrefix+"/ravenwood-runtime/framework-minus-apex.ravenwood.jar")
|
||||
android.AssertStringListContains(t, "orderOnly", orderOnly, installPathPrefix+"/ravenwood-runtime/framework-services.ravenwood.jar")
|
||||
android.AssertStringListContains(t, "orderOnly", orderOnly, installPathPrefix+"/ravenwood-utils/framework-rules.ravenwood.jar")
|
||||
}
|
||||
|
|
@ -33,6 +33,7 @@ func init() {
|
|||
pctx.SourcePathVariable("NativeTestConfigTemplate", "build/make/core/native_test_config_template.xml")
|
||||
pctx.SourcePathVariable("PythonBinaryHostMoblyTestConfigTemplate", "build/make/core/python_binary_host_mobly_test_config_template.xml")
|
||||
pctx.SourcePathVariable("PythonBinaryHostTestConfigTemplate", "build/make/core/python_binary_host_test_config_template.xml")
|
||||
pctx.SourcePathVariable("RavenwoodTestConfigTemplate", "build/make/core/ravenwood_test_config_template.xml")
|
||||
pctx.SourcePathVariable("RustDeviceTestConfigTemplate", "build/make/core/rust_device_test_config_template.xml")
|
||||
pctx.SourcePathVariable("RustHostTestConfigTemplate", "build/make/core/rust_host_test_config_template.xml")
|
||||
pctx.SourcePathVariable("RustDeviceBenchmarkConfigTemplate", "build/make/core/rust_device_benchmark_config_template.xml")
|
||||
|
|
|
|||
Loading…
Reference in a new issue