diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 23:20:23 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 23:20:23 +0000 |
| commit | dcc5fbf40e0070c78cfe91c497534a6977293972 (patch) | |
| tree | dbdb65cc8b04a2d98a6c50d83fcf8854fa8b18f1 /build | |
| parent | 4f53ffb8fe75d1571cf288b6cc3a7acfe682751f (diff) | |
| download | chromium_src-dcc5fbf40e0070c78cfe91c497534a6977293972.zip chromium_src-dcc5fbf40e0070c78cfe91c497534a6977293972.tar.gz chromium_src-dcc5fbf40e0070c78cfe91c497534a6977293972.tar.bz2 | |
Android: Filter browsertests with MANUAL_ and PRE_ prefix.
BUG=138275
Review URL: https://codereview.chromium.org/12913002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/browsertests/dispatch.py | 20 | ||||
| -rw-r--r-- | build/android/pylib/gtest/filter/content_browsertests_disabled | 7 |
2 files changed, 18 insertions, 9 deletions
diff --git a/build/android/pylib/browsertests/dispatch.py b/build/android/pylib/browsertests/dispatch.py index 5d2f48d..7e4e16c 100644 --- a/build/android/pylib/browsertests/dispatch.py +++ b/build/android/pylib/browsertests/dispatch.py @@ -55,8 +55,9 @@ def Dispatch(options): if options.gtest_filter: all_tests = [t for t in options.gtest_filter.split(':') if t] else: - all_tests = gtest_dispatch.GetAllEnabledTests(RunnerFactory, - attached_devices) + all_enabled = gtest_dispatch.GetAllEnabledTests(RunnerFactory, + attached_devices) + all_tests = _FilterTests(all_enabled) # Run tests. test_results = shard.ShardAndRunTests(RunnerFactory, attached_devices, @@ -67,3 +68,18 @@ def Dispatch(options): build_type=options.build_type, flakiness_server=options.flakiness_dashboard_server) test_results.PrintAnnotation() + +def _FilterTests(all_enabled_tests): + """Filters out tests and fixtures starting with PRE_ and MANUAL_.""" + return [t for t in all_enabled_tests if _ShouldRunOnBot(t)] + +def _ShouldRunOnBot(test): + fixture, case = test.split('.', 1) + if _StartsWith(fixture, case, "PRE_"): + return False + if _StartsWith(fixture, case, "MANUAL_"): + return False + return True + +def _StartsWith(a, b, prefix): + return a.startswith(prefix) or b.startswith(prefix) diff --git a/build/android/pylib/gtest/filter/content_browsertests_disabled b/build/android/pylib/gtest/filter/content_browsertests_disabled index 1ff115f..102cd34 100644 --- a/build/android/pylib/gtest/filter/content_browsertests_disabled +++ b/build/android/pylib/gtest/filter/content_browsertests_disabled @@ -16,30 +16,23 @@ IndexedDBBrowserTest.VersionChangeCrashResilience IndexedDBBrowserTest.ValueSizeTest IndexedDBBrowserTest.ConnectionsClosedOnTabClose CrossPlatformAccessibilityBrowserTest.* -GpuCrashTest.MANUAL_WebkitLoseContext DatabaseTest.* # Failures WorkerLayoutTest.* MediaLayoutTest.* IndexedDBLayoutTest.* -ContentBrowserTest.MANUAL_ShouldntRun RenderViewHostTest.BaseURLParam OffTheRecordClipboardTest.ClearContentData FileSystemLayoutTest.* -GpuPixelTestCanvas2DSD.MANUAL_Canvas2DRedBoxSD GpuPixelBrowserTest.* BlobLayoutTest.XhrResponseBlob FileSystemBrowserTestWithLowQuota.QuotaTest BlobLayoutTest.* ChildProcessSecurityPolicyInProcessBrowserTest.NoLeak -# Failure, see crbug/189186 -GpuPixelTestBrowserPlugin.MANUAL_BrowserPluginBlueBox - # Crashes WorkerXHRHttpLayoutTest.Tests -GpuCrashTest.MANUAL_Kill # Needs to start the test server before # BrowserTestBase::SetUpCommandLine is called, but on Android |