Skip to content

Commit

Permalink
[Android] Implement perf tests to platform mode.
Browse files Browse the repository at this point in the history
BUG=615157, 590229

Review-Url: https://codereview.chromium.org/2012323002
Cr-Commit-Position: refs/heads/master@{#404978}
  • Loading branch information
randalnephew authored and Commit bot committed Jul 13, 2016
1 parent dfe8ae7 commit 8db92cc
Show file tree
Hide file tree
Showing 8 changed files with 687 additions and 9 deletions.
3 changes: 3 additions & 0 deletions build/android/pylib/base/test_instance_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from pylib.gtest import gtest_test_instance
from pylib.instrumentation import instrumentation_test_instance
from pylib.perf import perf_test_instance
from pylib.uirobot import uirobot_test_instance
from pylib.utils import isolator

Expand All @@ -16,6 +17,8 @@ def CreateTestInstance(args, error_func):
elif args.command == 'instrumentation':
return instrumentation_test_instance.InstrumentationTestInstance(
args, isolator.Isolator(), error_func)
elif args.command == 'perf':
return perf_test_instance.PerfTestInstance(args, error_func)
elif args.command == 'uirobot':
return uirobot_test_instance.UirobotTestInstance(args, error_func)

Expand Down
18 changes: 17 additions & 1 deletion build/android/pylib/base/test_run_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
from pylib.local.device import local_device_environment
from pylib.local.device import local_device_gtest_run
from pylib.local.device import local_device_instrumentation_test_run
from pylib.local.device import local_device_perf_test_run
from pylib.perf import perf_test_instance
from pylib.uirobot import uirobot_test_instance

try:
Expand All @@ -21,14 +23,28 @@
remote_device_uirobot_test_run = None


def CreateTestRun(_args, env, test_instance, error_func):
def _CreatePerfTestRun(args, env, test_instance):
if args.print_step:
return local_device_perf_test_run.PrintStep(
env, test_instance)
elif args.output_json_list:
return local_device_perf_test_run.OutputJsonList(
env, test_instance)
return local_device_perf_test_run.LocalDevicePerfTestRun(
env, test_instance)


def CreateTestRun(args, env, test_instance, error_func):
if isinstance(env, local_device_environment.LocalDeviceEnvironment):
if isinstance(test_instance, gtest_test_instance.GtestTestInstance):
return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance)
if isinstance(test_instance,
instrumentation_test_instance.InstrumentationTestInstance):
return (local_device_instrumentation_test_run
.LocalDeviceInstrumentationTestRun(env, test_instance))
if isinstance(test_instance,
perf_test_instance.PerfTestInstance):
return _CreatePerfTestRun(args, env, test_instance)

if (remote_device_environment
and isinstance(env, remote_device_environment.RemoteDeviceEnvironment)):
Expand Down
4 changes: 4 additions & 0 deletions build/android/pylib/local/device/local_device_environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ def SetUp(self):
self._logcat_monitors.append(monitor)
monitor.Start()

@property
def blacklist(self):
return self._blacklist

@property
def concurrent_adb(self):
return self._concurrent_adb
Expand Down
Loading

0 comments on commit 8db92cc

Please sign in to comment.