Index: tools/telemetry/telemetry/unittest/run_tests.py |
diff --git a/tools/telemetry/telemetry/unittest/run_tests.py b/tools/telemetry/telemetry/unittest/run_tests.py |
index 85010839982c017c7caa48bd81ca0a672adcae6b..c4f2e216c8f592ecf3667f04075a1151666fecbc 100644 |
--- a/tools/telemetry/telemetry/unittest/run_tests.py |
+++ b/tools/telemetry/telemetry/unittest/run_tests.py |
@@ -7,6 +7,7 @@ import unittest |
from telemetry.core import browser_options |
from telemetry.core import discover |
from telemetry.core import util |
+from telemetry.core.backends.chrome import cros_interface |
from telemetry.unittest import gtest_testrunner |
from telemetry.unittest import options_for_unittests |
@@ -72,6 +73,9 @@ def DiscoverAndRunTests( |
if hasattr(method, '_disabled_test'): |
if not run_disabled_tests: |
return False |
+ if (hasattr(method, '_disabled_test_on_cros') and |
+ cros_interface.IsRunningOnCrosDevice()): |
+ return False |
return True |