From be6ae776e598581471d743408085c9c7691c906c Mon Sep 17 00:00:00 2001 From: frankfeng Date: Mon, 28 Sep 2020 13:22:57 -0700 Subject: [PATCH] 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 --- sh/sh_binary.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sh/sh_binary.go b/sh/sh_binary.go index f3f4a4aa7..7c3cdbdbb 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -313,6 +313,15 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { options := []tradefed.Option{{Name: "force-root", Value: "false"}} 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.testProperties.Test_config_template, s.testProperties.Test_suites, configs, s.testProperties.Auto_gen_config, s.outputFilePath.Base())