Index: build/android/pylib/local/device/local_device_gtest_run.py |
diff --git a/build/android/pylib/local/device/local_device_gtest_run.py b/build/android/pylib/local/device/local_device_gtest_run.py |
index 82da53546278d9ae7e8859d07a9a60e9033f4c86..ee38e0527c8fb81a9b338c16c2be484174ded03a 100644 |
--- a/build/android/pylib/local/device/local_device_gtest_run.py |
+++ b/build/android/pylib/local/device/local_device_gtest_run.py |
@@ -438,7 +438,12 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun): |
stream_name, resolved_tombstones) |
result.SetLink('tombstones', tombstones_url) |
- not_run_tests = set(test).difference(set(r.GetName() for r in results)) |
+ tests_stripped_disabled_prefix = set() |
+ for t in test: |
+ tests_stripped_disabled_prefix.add( |
+ gtest_test_instance.TestNameWithoutDisabledPrefix(t)) |
+ not_run_tests = tests_stripped_disabled_prefix.difference( |
+ set(r.GetName() for r in results)) |
return results, list(not_run_tests) if results else None |
#override |