diff options
| author | 2023-11-15 12:39:40 -0800 | |
|---|---|---|
| committer | 2023-11-30 13:38:49 -0800 | |
| commit | 5c1d5fb21b19d6bcc8b0f83bc68124c21b31fabc (patch) | |
| tree | 5cf196863f57dfc7ae817cf9ede98cf53126559f /python | |
| parent | 312634eb0fd02c2e084a6925c4f00e5fc00fca54 (diff) | |
Move test data installation to Soong
To generate module-info.json in Soong for b/309006256 Soong needs to
know the test data paths. Moving test data installation into Soong will
also help later for test suite packaging.
Add ModuleContext.InstallTestData that installs the files listed in a
[]DataPath alongside the test. The files will also be passed to Make
to allow it to continue packaging them into the test suites for now.
Update the module types that are producing LOCAL_TEST_DATA entries
in their Android.mk files to go through InstallTestData instead.
Bug: 311428265
Test: atest --host toybox-gtests --test-timeout=120000
Change-Id: Ia8b964f86e584ea464667fd86a48d754d118bead
Diffstat (limited to 'python')
| -rw-r--r-- | python/test.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/python/test.go b/python/test.go index cd7c73b5a..41c5538d5 100644 --- a/python/test.go +++ b/python/test.go @@ -188,8 +188,6 @@ func (p *PythonTestModule) GenerateAndroidBuildActions(ctx android.ModuleContext panic(fmt.Errorf("unknown python test runner '%s', should be 'tradefed' or 'mobly'", runner)) } - p.installedDest = ctx.InstallFile(installDir(ctx, "nativetest", "nativetest64", ctx.ModuleName()), p.installSource.Base(), p.installSource) - for _, dataSrcPath := range android.PathsForModuleSrc(ctx, p.testProperties.Data) { p.data = append(p.data, android.DataPath{SrcPath: dataSrcPath}) } @@ -206,6 +204,11 @@ func (p *PythonTestModule) GenerateAndroidBuildActions(ctx android.ModuleContext p.data = append(p.data, android.DataPath{SrcPath: javaDataSrcPath}) } } + + installDir := installDir(ctx, "nativetest", "nativetest64", ctx.ModuleName()) + installedData := ctx.InstallTestData(installDir, p.data) + p.installedDest = ctx.InstallFile(installDir, p.installSource.Base(), p.installSource, installedData...) + ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) } @@ -227,8 +230,6 @@ func (p *PythonTestModule) AndroidMkEntries() []android.AndroidMkEntries { entries.SetBoolIfTrue("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", !BoolDefault(p.binaryProperties.Auto_gen_config, true)) - entries.AddStrings("LOCAL_TEST_DATA", android.AndroidMkDataPaths(p.data)...) - p.testProperties.Test_options.SetAndroidMkEntries(entries) }) |