diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 02:33:04 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 02:33:04 +0000 |
| commit | 3d26235f0e2c5f41fd999b8b363e9547cff03514 (patch) | |
| tree | a1d79fcb84b71e94681dec3512bbadcc5b5e2410 | |
| parent | 6075d0503672122dfb761259b0dcacafe90c5770 (diff) | |
| download | chromium_src-3d26235f0e2c5f41fd999b8b363e9547cff03514.zip chromium_src-3d26235f0e2c5f41fd999b8b363e9547cff03514.tar.gz chromium_src-3d26235f0e2c5f41fd999b8b363e9547cff03514.tar.bz2 | |
Disable testOpenAllOptionsPages on views, rather than chromeos.
BUG=90420
TEST=OptionsWebUITest.testOpenAllOptionsPages
Review URL: http://codereview.chromium.org/7884004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100841 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/data/webui/options.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/data/webui/options.js b/chrome/test/data/webui/options.js index fe4c37f..6f6a594 100644 --- a/chrome/test/data/webui/options.js +++ b/chrome/test/data/webui/options.js @@ -107,11 +107,11 @@ TEST_F('OptionsWebUITest', 'MAYBE_testRefreshStaysOnCurrentPage', function() { // Test that there are no console errors after opening all registered pages. // Crashes on chromium os, flaky on other platforms. See crbug.com/90420. -GEN('#if defined(OS_CHROMEOS)'); +GEN('#if defined(TOOLKIT_VIEWS)'); GEN('#define MAYBE_testOpenAllOptionsPages DISABLED_testOpenAllOptionsPages'); GEN('#else'); GEN('#define MAYBE_testOpenAllOptionsPages FLAKY_testOpenAllOptionsPages'); -GEN('#endif // defined(OS_CHROMEOS)'); +GEN('#endif // defined(TOOLKIT_VIEWS)'); TEST_F('OptionsWebUITest', 'MAYBE_testOpenAllOptionsPages', function() { expectTrue(!!OptionsPage.registeredPages); for (var name in OptionsPage.registeredPages) { |