Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2693)

Unified Diff: build/android/pylib/base/environment_factory.py

Issue 788753002: [Android] Implement gtest and local in platform mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix findbugs + move log parsing up to GtestTestInstance Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/PRESUBMIT.py ('k') | build/android/pylib/base/test_collection.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/base/environment_factory.py
diff --git a/build/android/pylib/base/environment_factory.py b/build/android/pylib/base/environment_factory.py
index 3ad39fc6f1bed1ba981b68b14081965daa55c896..31b4952ac16480b4885f65ec11736ffcf1acf352 100644
--- a/build/android/pylib/base/environment_factory.py
+++ b/build/android/pylib/base/environment_factory.py
@@ -2,13 +2,16 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+from pylib import constants
+from pylib.local.device import local_device_environment
from pylib.remote.device import remote_device_environment
def CreateEnvironment(args, error_func):
- # TODO(jbudorick) Add local device environment.
- # TODO(jbudorick) Add local machine environment.
-
+ if args.environment == 'local':
+ if args.command not in constants.LOCAL_MACHINE_TESTS:
+ return local_device_environment.LocalDeviceEnvironment(args, error_func)
+ # TODO(jbudorick) Add local machine environment.
if args.environment == 'remote_device':
return remote_device_environment.RemoteDeviceEnvironment(args,
error_func)
« no previous file with comments | « build/android/PRESUBMIT.py ('k') | build/android/pylib/base/test_collection.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698