Skip to content

Commit 057e316

Browse files
A Googlercopybara-github
authored andcommitted
Enabling LocalSocket for UTP tests. If you have not updated to androidx.test:services:1.6.0-alpha01, you need to set a flag to fall back to SpeakEasy.
PiperOrigin-RevId: 702111532 Change-Id: I1ba4dfa57f9bdb30c17551af9ab9198ab8e01ca1
1 parent 74e8f82 commit 057e316

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

launcher/android_instrumentation_driver.bzl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def _android_instrumentation_driver_impl(ctx):
4545
),
4646
use_orchestrator = ctx.attr.use_orchestrator,
4747
shell_execution_option = ctx.attr.shell_execution,
48+
use_local_socket_shell_executor = ctx.attr.use_local_socket_shell_executor,
4849
)
4950
if ctx.attr.am_instrument_timeout > 0:
5051
configuration["am_instrument_timeout"] = ctx.attr.am_instrument_timeout
@@ -93,5 +94,9 @@ android_instrumentation_driver = rule(
9394
doc = "How to perform shell command execution.",
9495
default = NO_SHELL_EXECUTION,
9596
),
97+
use_local_socket_shell_executor = attr.bool(
98+
doc = "Use the LocalSocket shell executor.",
99+
default = True,
100+
),
96101
),
97102
)

test/launcher/android_instrumentation_driver_test.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ android_instrumentation_runtime {
5454
}
5555
}
5656
shell_execution_option: "@!NO_SHELL_EXECUTION!@"
57+
use_local_socket_shell_executor: true
5758
use_orchestrator: true
5859
""".strip()
5960

0 commit comments

Comments
 (0)