diff options
Diffstat (limited to 'sh/sh_binary.go')
| -rw-r--r-- | sh/sh_binary.go | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 57f5ad1c7..257d60936 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -540,6 +540,17 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { installedData := ctx.InstallTestData(s.installDir, s.data) s.installedFile = ctx.InstallExecutable(s.installDir, s.outputFilePath.Base(), s.outputFilePath, installedData...) + ctx.SetTestSuiteInfo(android.TestSuiteInfo{ + TestSuites: s.testProperties.Test_suites, + MainFile: s.outputFilePath, + MainFileStem: s.outputFilePath.Base(), + ConfigFile: s.testConfig, + ExtraConfigs: s.extraTestConfigs, + Data: s.data, + NeedsArchFolder: true, + PerTestcaseDirectory: proptools.Bool(s.testProperties.Per_testcase_directory), + }) + mkEntries := s.AndroidMkEntries()[0] android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{ TestcaseRelDataFiles: addArch(ctx.Arch().ArchType.String(), installedData.Paths()), @@ -574,10 +585,6 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { moduleInfoJSON.TestConfig = append(moduleInfoJSON.TestConfig, s.testConfig.String()) } moduleInfoJSON.TestConfig = append(moduleInfoJSON.TestConfig, s.extraTestConfigs.Strings()...) - - android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{ - TestSuites: s.testProperties.Test_suites, - }) } func addArch(archType string, paths android.Paths) []string { |