diff options
Diffstat (limited to 'rust/test.go')
| -rw-r--r-- | rust/test.go | 85 |
1 files changed, 73 insertions, 12 deletions
diff --git a/rust/test.go b/rust/test.go index dce5e0391..9833ffdb6 100644 --- a/rust/test.go +++ b/rust/test.go @@ -46,9 +46,16 @@ type TestProperties struct { // the test Data []string `android:"path,arch_variant"` - // Same as data, but will add dependencies on the device's + // Same as data, but adds dependencies on modules using the device's os variant, and common + // architecture's variant. Can be useful to add device-built apps to the data of a host + // test. Device_common_data []string `android:"path_device_common"` + // Same as data, but will add dependencies on modules using the host's os variation and + // the common arch variation. Useful for a device test that wants to depend on a host + // module, for example to include a custom Tradefed test runner. + Host_common_data []string `android:"path_host_common"` + // list of shared library modules that should be installed alongside the test Data_libs []string `android:"arch_variant"` @@ -147,36 +154,38 @@ func (test *testDecorator) install(ctx ModuleContext) { dataSrcPaths := android.PathsForModuleSrc(ctx, test.Properties.Data) dataSrcPaths = append(dataSrcPaths, android.PathsForModuleSrc(ctx, test.Properties.Device_common_data)...) + dataSrcPaths = append(dataSrcPaths, android.PathsForModuleSrc(ctx, test.Properties.Host_common_data)...) - ctx.VisitDirectDepsWithTag(dataLibDepTag, func(dep android.Module) { + ctx.VisitDirectDepsProxyWithTag(dataLibDepTag, func(dep android.ModuleProxy) { depName := ctx.OtherModuleName(dep) - linkableDep, ok := dep.(cc.LinkableInterface) + linkableDep, ok := android.OtherModuleProvider(ctx, dep, cc.LinkableInfoProvider) if !ok { ctx.ModuleErrorf("data_lib %q is not a linkable module", depName) } - if linkableDep.OutputFile().Valid() { + if linkableDep.OutputFile.Valid() { // Copy the output in "lib[64]" so that it's compatible with // the default rpath values. + commonInfo := android.OtherModuleProviderOrDefault(ctx, dep, android.CommonModuleInfoKey) libDir := "lib" - if linkableDep.Target().Arch.ArchType.Multilib == "lib64" { + if commonInfo.Target.Arch.ArchType.Multilib == "lib64" { libDir = "lib64" } test.data = append(test.data, - android.DataPath{SrcPath: linkableDep.OutputFile().Path(), - RelativeInstallPath: filepath.Join(libDir, linkableDep.RelativeInstallPath())}) + android.DataPath{SrcPath: linkableDep.OutputFile.Path(), + RelativeInstallPath: filepath.Join(libDir, linkableDep.RelativeInstallPath)}) } }) - ctx.VisitDirectDepsWithTag(dataBinDepTag, func(dep android.Module) { + ctx.VisitDirectDepsProxyWithTag(dataBinDepTag, func(dep android.ModuleProxy) { depName := ctx.OtherModuleName(dep) - linkableDep, ok := dep.(cc.LinkableInterface) + linkableDep, ok := android.OtherModuleProvider(ctx, dep, cc.LinkableInfoProvider) if !ok { ctx.ModuleErrorf("data_bin %q is not a linkable module", depName) } - if linkableDep.OutputFile().Valid() { + if linkableDep.OutputFile.Valid() { test.data = append(test.data, - android.DataPath{SrcPath: linkableDep.OutputFile().Path(), - RelativeInstallPath: linkableDep.RelativeInstallPath()}) + android.DataPath{SrcPath: linkableDep.OutputFile.Path(), + RelativeInstallPath: linkableDep.RelativeInstallPath}) } }) @@ -194,6 +203,31 @@ func (test *testDecorator) install(ctx ModuleContext) { if ctx.Host() && test.Properties.Test_options.Unit_test == nil { test.Properties.Test_options.Unit_test = proptools.BoolPtr(true) } + + if !ctx.Config().KatiEnabled() { // TODO(spandandas): Remove the special case for kati + // Install the test config in testcases/ directory for atest. + r, ok := ctx.Module().(*Module) + if !ok { + ctx.ModuleErrorf("Not a rust test module") + } + // Install configs in the root of $PRODUCT_OUT/testcases/$module + testCases := android.PathForModuleInPartitionInstall(ctx, "testcases", ctx.ModuleName()+r.SubName()) + if ctx.PrimaryArch() { + if test.testConfig != nil { + ctx.InstallFile(testCases, ctx.ModuleName()+".config", test.testConfig) + } + dynamicConfig := android.ExistentPathForSource(ctx, ctx.ModuleDir(), "DynamicConfig.xml") + if dynamicConfig.Valid() { + ctx.InstallFile(testCases, ctx.ModuleName()+".dynamic", dynamicConfig.Path()) + } + } + // Install tests and data in arch specific subdir $PRODUCT_OUT/testcases/$module/$arch + testCases = testCases.Join(ctx, ctx.Target().Arch.ArchType.String()) + ctx.InstallTestData(testCases, test.data) + testPath := ctx.RustModule().OutputFile().Path() + ctx.InstallFile(testCases, testPath.Base(), testPath) + } + test.binaryDecorator.installTestData(ctx, test.data) test.binaryDecorator.install(ctx) } @@ -202,6 +236,7 @@ func (test *testDecorator) compilerFlags(ctx ModuleContext, flags Flags) Flags { flags = test.binaryDecorator.compilerFlags(ctx, flags) if test.testHarness() { flags.RustFlags = append(flags.RustFlags, "--test") + flags.RustFlags = append(flags.RustFlags, "-A missing-docs") } if ctx.Device() { flags.RustFlags = append(flags.RustFlags, "-Z panic_abort_tests") @@ -257,6 +292,32 @@ func (test *testDecorator) testBinary() bool { return true } +func (test *testDecorator) moduleInfoJSON(ctx ModuleContext, moduleInfoJSON *android.ModuleInfoJSON) { + test.binaryDecorator.moduleInfoJSON(ctx, moduleInfoJSON) + moduleInfoJSON.Class = []string{"NATIVE_TESTS"} + if Bool(test.Properties.Test_options.Unit_test) { + moduleInfoJSON.IsUnitTest = "true" + if ctx.Host() { + moduleInfoJSON.CompatibilitySuites = append(moduleInfoJSON.CompatibilitySuites, "host-unit-tests") + } + } + moduleInfoJSON.TestOptionsTags = append(moduleInfoJSON.TestOptionsTags, test.Properties.Test_options.Tags...) + if test.testConfig != nil { + if _, ok := test.testConfig.(android.WritablePath); ok { + moduleInfoJSON.AutoTestConfig = []string{"true"} + } + moduleInfoJSON.TestConfig = append(moduleInfoJSON.TestConfig, test.testConfig.String()) + } + + moduleInfoJSON.DataDependencies = append(moduleInfoJSON.DataDependencies, test.Properties.Data_bins...) + + if len(test.Properties.Test_suites) > 0 { + moduleInfoJSON.CompatibilitySuites = append(moduleInfoJSON.CompatibilitySuites, test.Properties.Test_suites...) + } else { + moduleInfoJSON.CompatibilitySuites = append(moduleInfoJSON.CompatibilitySuites, "null-suite") + } +} + func rustTestHostMultilib(ctx android.LoadHookContext) { type props struct { Target struct { |