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

Unified Diff: build/android/pylib/instrumentation/instrumentation_test_instance.py

Issue 1904823003: Generate Android .isolate files used for test()s (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert to PS2 Created 4 years, 8 months 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/pylib/gtest/gtest_test_instance.py ('k') | build/android/pylib/utils/isolator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/instrumentation/instrumentation_test_instance.py
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py
index e9c33f1c544c7fc9fbac1fc0092b8d9cea6f69a8..9f1e439ca0b1bfd4fd3209857719044ceab423c9 100644
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py
@@ -17,6 +17,7 @@ from pylib.base import test_instance
from pylib.constants import host_paths
from pylib.instrumentation import test_result
from pylib.instrumentation import instrumentation_parser
+from pylib.utils import isolator
from pylib.utils import proguard
with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
@@ -292,7 +293,8 @@ class InstrumentationTestInstance(test_instance.TestInstance):
def _initializeDataDependencyAttributes(self, args, isolate_delegate):
self._data_deps = []
- if args.isolate_file_path:
+ if (args.isolate_file_path and
+ not isolator.IsIsolateEmpty(args.isolate_file_path)):
if os.path.isabs(args.isolate_file_path):
self._isolate_abs_path = args.isolate_file_path
else:
« no previous file with comments | « build/android/pylib/gtest/gtest_test_instance.py ('k') | build/android/pylib/utils/isolator.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698