diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 21:26:57 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 21:26:57 +0000 |
| commit | 5b5fbcce431d937fbef08a89979281a52506603e (patch) | |
| tree | 3b1a6b55cf561b0a2f60b79998da7e0bc0790c0d /build | |
| parent | 162deb8fa72342e8dae1c4793f9b6c4630af2a47 (diff) | |
| download | chromium_src-5b5fbcce431d937fbef08a89979281a52506603e.zip chromium_src-5b5fbcce431d937fbef08a89979281a52506603e.tar.gz chromium_src-5b5fbcce431d937fbef08a89979281a52506603e.tar.bz2 | |
Android: Don't push layout_tests data for content browser tests.
These tests are now deleted. See: crbug.com/247459
Also disable some tests which were enabled but not fixed.
See: https://codereview.chromium.org/16268011
BUG=238485
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/16633004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/buildbot/bb_device_steps.py | 2 | ||||
| -rw-r--r-- | build/android/pylib/gtest/filter/content_browsertests_disabled | 12 | ||||
| -rw-r--r-- | build/android/pylib/gtest/test_runner.py | 16 |
3 files changed, 13 insertions, 17 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py index 621dd08..0b36025 100755 --- a/build/android/buildbot/bb_device_steps.py +++ b/build/android/buildbot/bb_device_steps.py @@ -116,7 +116,7 @@ def RunBrowserTestSuite(options): Args: options: options object. """ - args = ['--verbose'] + args = ['--verbose', '--num_retries=1'] if options.target == 'Release': args.append('--release') if options.asan: diff --git a/build/android/pylib/gtest/filter/content_browsertests_disabled b/build/android/pylib/gtest/filter/content_browsertests_disabled index 7a1d5cb..8b7c8d3 100644 --- a/build/android/pylib/gtest/filter/content_browsertests_disabled +++ b/build/android/pylib/gtest/filter/content_browsertests_disabled @@ -75,3 +75,15 @@ WebrtcBrowserTest.CallWithDataAndLaterAddMedia # http://crbug.com/224134 RenderWidgetHostBrowserTest.GetSnapshotFromRendererTest + +# http://crbug.com/233118 +IndexedDBBrowserTest.* +IndexedDBBrowserTestWithMissingSSTFile.DestroyTest +IndexedDBBrowserTestWithVersion0Schema.MigrationTest +IndexedDBBrowserTestWithVersion123456Schema.DestroyTest +IndexedDBBrowserTestWithVersion987654SSVData.DestroyTest + +BookmarkletTest.NonEmptyResult +MediaSourceTest.Playback_AudioOnly_WebM +MediaSourceTest.Playback_VideoAudio_WebM +MediaSourceTest.Playback_VideoOnly_WebM diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py index de3e6c3..4b5b5e9 100644 --- a/build/android/pylib/gtest/test_runner.py +++ b/build/android/pylib/gtest/test_runner.py @@ -205,22 +205,6 @@ def _GetOptionalDataFilesForTestSuite(test_suite_basename): if test_suite_basename == 'content_browsertests': # See http://crbug.com/105104 for why these are needed. return [ - 'third_party/WebKit/LayoutTests/fast/events', - 'third_party/WebKit/LayoutTests/fast/files', - 'third_party/WebKit/LayoutTests/fast/filesystem', - 'third_party/WebKit/LayoutTests/fast/js/resources', - 'third_party/WebKit/LayoutTests/fast/workers', - 'third_party/WebKit/LayoutTests/http/tests', - 'third_party/WebKit/LayoutTests/storage/indexeddb', - 'third_party/WebKit/LayoutTests/media', - 'content/test/data/layout_tests/LayoutTests/fast/events', - 'content/test/data/layout_tests/LayoutTests/fast/files', - 'content/test/data/layout_tests/LayoutTests/fast/filesystem', - 'content/test/data/layout_tests/LayoutTests/fast/js/resources', - 'content/test/data/layout_tests/LayoutTests/fast/workers', - 'content/test/data/layout_tests/LayoutTests/http/tests', - 'content/test/data/layout_tests/LayoutTests/storage/indexeddb', - 'content/test/data/layout_tests/LayoutTests/media', ] return [] |