From ec7314336a2b35ea30ce5438b83949c28e3ac429 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Fri, 26 May 2023 04:21:44 +0000 Subject: Support test runnner option in auto generated test configs Bug: 284179405 Bug: 236980335 Test: unittest Change-Id: Ifae3d556ff79153ca6c3067347fc259b665fb2e1 --- java/java_test.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index ea89e6eb8..cd5c343ce 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -2298,3 +2298,27 @@ java_test_host { t.Errorf("Expected args[\"extraConfigs\"] to equal %q, was %q", expected, args["extraConfigs"]) } } + +func TestTestRunnerOptions(t *testing.T) { + result := PrepareForTestWithJavaBuildComponents.RunTestWithBp(t, ` +java_test_host { + name: "foo", + test_options: { + test_runner_options: [ + { + name: "test-timeout", + value: "10m" + } + ] + } +} +`) + + buildOS := result.Config.BuildOS.String() + args := result.ModuleForTests("foo", buildOS+"_common"). + Output("out/soong/.intermediates/foo/" + buildOS + "_common/foo.config").Args + expected := proptools.NinjaAndShellEscape("