openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support auto-push of data_device_bins to device in test config auto-gen for sh-test 

Bug: 148805488
Test: m
Test: ziptool-tests:
Change-Id: Iee4e8550dc77220ea576c5c33ade5d3b770573f0
This commit is contained in:
frankfeng 2020-09-28 13:22:57 -07:00
parent 386821fae7
commit be6ae776e5
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sh/sh_binary.go
View File

@ -313,6 +313,15 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
options := []tradefed.Option{{Name: "force-root", Value: "false"}} options := []tradefed.Option{{Name: "force-root", Value: "false"}}
configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.RootTargetPreparer", options}) configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.RootTargetPreparer", options})
} }
if len(s.testProperties.Data_device_bins) > 0 {
moduleName := s.Name()
remoteDir := "/data/local/tests/unrestricted/" + moduleName + "/"
options := []tradefed.Option{{Name: "cleanup", Value: "true"}}
for _, bin := range s.testProperties.Data_device_bins {
options = append(options, tradefed.Option{Name: "push-file", Key: bin, Value: remoteDir + bin})
}
configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.PushFilePreparer", options})
}
s.testConfig = tradefed.AutoGenShellTestConfig(ctx, s.testProperties.Test_config, s.testConfig = tradefed.AutoGenShellTestConfig(ctx, s.testProperties.Test_config,
s.testProperties.Test_config_template, s.testProperties.Test_suites, configs, s.testProperties.Auto_gen_config, s.outputFilePath.Base()) s.testProperties.Test_config_template, s.testProperties.Test_suites, configs, s.testProperties.Auto_gen_config, s.outputFilePath.Base())