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

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

Issue 2544533006: [Android] Add '--gtest_also_run_disabled_tests' for instrumentation tests (Closed)
Patch Set: john comment Created 4 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 | « no previous file | build/android/test_runner.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 c2c1f4cb69f771e5b4016a627352391b4c30f7dc..5b0c1595c273827a1c41c0f6fd82c848e0d6de5c 100644
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py
@@ -549,9 +549,10 @@ class InstrumentationTestInstance(test_instance.TestInstance):
self._excluded_annotations = []
requested_annotations = set(a[0] for a in self._annotations)
- self._excluded_annotations.extend(
- annotation_element(a) for a in _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS
- if a not in requested_annotations)
+ if not args.run_disabled:
+ self._excluded_annotations.extend(
+ annotation_element(a) for a in _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS
+ if a not in requested_annotations)
def _initializeFlagAttributes(self, args):
self._flags = ['--enable-test-intents']
« no previous file with comments | « no previous file | build/android/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698