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

Unified Diff: build/android/pylib/gtest/gtest_test_instance.py

Issue 1416763003: [Android] Fix --test-arguments. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | « no previous file | build/android/pylib/local/device/local_device_gtest_run.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/gtest/gtest_test_instance.py
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
index d276592d793bdc5abf0a0a0984074566a25356ab..f7ea73a794253e9dd0b776153aa8c9720f9697cd 100644
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -198,10 +198,64 @@ class GtestTestInstance(test_instance.TestInstance):
self._app_data_files = None
self._app_data_file_dir = None
+ self._test_arguments = args.test_arguments
+
+ @property
+ def activity(self):
+ return self._apk_helper and self._apk_helper.GetActivityName()
+
+ @property
+ def apk(self):
+ return self._apk_helper and self._apk_helper.path
+
+ @property
+ def apk_helper(self):
+ return self._apk_helper
+
+ @property
+ def app_file_dir(self):
+ return self._app_data_file_dir
+
+ @property
+ def app_files(self):
+ return self._app_data_files
+
+ @property
+ def exe(self):
+ return self._exe_path
+
+ @property
+ def extras(self):
+ return self._extras
+
@property
def gtest_filter(self):
return self._gtest_filter
+ @property
+ def package(self):
+ return self._apk_helper and self._apk_helper.GetPackageName()
+
+ @property
+ def permissions(self):
+ return self._apk_helper and self._apk_helper.GetPermissions()
+
+ @property
+ def runner(self):
+ return self._apk_helper and self._apk_helper.GetInstrumentationName()
+
+ @property
+ def shard_timeout(self):
+ return self._shard_timeout
+
+ @property
+ def suite(self):
+ return self._suite
+
+ @property
+ def test_arguments(self):
+ return self._test_arguments
+
#override
def TestType(self):
return 'gtest'
@@ -314,51 +368,3 @@ class GtestTestInstance(test_instance.TestInstance):
if self._isolate_delegate:
self._isolate_delegate.Clear()
- @property
- def activity(self):
- return self._apk_helper and self._apk_helper.GetActivityName()
-
- @property
- def apk(self):
- return self._apk_helper and self._apk_helper.path
-
- @property
- def apk_helper(self):
- return self._apk_helper
-
- @property
- def app_file_dir(self):
- return self._app_data_file_dir
-
- @property
- def app_files(self):
- return self._app_data_files
-
- @property
- def exe(self):
- return self._exe_path
-
- @property
- def extras(self):
- return self._extras
-
- @property
- def package(self):
- return self._apk_helper and self._apk_helper.GetPackageName()
-
- @property
- def permissions(self):
- return self._apk_helper and self._apk_helper.GetPermissions()
-
- @property
- def runner(self):
- return self._apk_helper and self._apk_helper.GetInstrumentationName()
-
- @property
- def shard_timeout(self):
- return self._shard_timeout
-
- @property
- def suite(self):
- return self._suite
-
« no previous file with comments | « no previous file | build/android/pylib/local/device/local_device_gtest_run.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698