Commit 69d8f2a5 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

[test] Update Android shell commands in perf runner

BUG=chromium:628617
NOTRY=true

Change-Id: I55923fec5ee34feea85dcc281b00f3d5d22283c5
Reviewed-on: https://chromium-review.googlesource.com/456710Reviewed-by: 's avatarIgor Sheludko <ishell@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#43983}
parent e7f5a040
...@@ -732,7 +732,8 @@ class AndroidPlatform(Platform): # pragma: no cover ...@@ -732,7 +732,8 @@ class AndroidPlatform(Platform): # pragma: no cover
def PostExecution(self): def PostExecution(self):
perf = perf_control.PerfControl(self.device) perf = perf_control.PerfControl(self.device)
perf.SetDefaultPerfMode() perf.SetDefaultPerfMode()
self.device.RunShellCommand(["rm", "-rf", AndroidPlatform.DEVICE_DIR]) self.device.RemovePath(
AndroidPlatform.DEVICE_DIR, force=True, recursive=True)
def _PushFile(self, host_dir, file_name, target_rel=".", def _PushFile(self, host_dir, file_name, target_rel=".",
skip_if_missing=False): skip_if_missing=False):
...@@ -830,6 +831,7 @@ class AndroidPlatform(Platform): # pragma: no cover ...@@ -830,6 +831,7 @@ class AndroidPlatform(Platform): # pragma: no cover
output = self.device.RunShellCommand( output = self.device.RunShellCommand(
cmd, cmd,
cwd=os.path.join(AndroidPlatform.DEVICE_DIR, bench_rel), cwd=os.path.join(AndroidPlatform.DEVICE_DIR, bench_rel),
check_return=True,
timeout=runnable.timeout, timeout=runnable.timeout,
retries=0, retries=0,
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment