diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 18:30:09 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 18:30:09 +0000 |
| commit | 5c4f2b8416618ddc464dd7501900fcbae86c0221 (patch) | |
| tree | 7ce2bc5670c6c84c84e4d248770e53d5fc56af51 /chrome/browser/page_cycler | |
| parent | eaf3317394cd752041ebd3eb0b3e5419b0b0454b (diff) | |
| download | chromium_src-5c4f2b8416618ddc464dd7501900fcbae86c0221.zip chromium_src-5c4f2b8416618ddc464dd7501900fcbae86c0221.tar.gz chromium_src-5c4f2b8416618ddc464dd7501900fcbae86c0221.tar.bz2 | |
Revert 165710 - PageCyclerCachedBrowserTest.PlaybackMode fails randomly on Linux debug and release
NOTRY=TRUE
TBR=thestig@chromium.org
BUG=159026
Review URL: https://chromiumcodereview.appspot.com/11293067
TBR=vandebo@chromium.org
Review URL: https://codereview.chromium.org/11367068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/page_cycler')
| -rw-r--r-- | chrome/browser/page_cycler/page_cycler_browsertest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/page_cycler/page_cycler_browsertest.cc b/chrome/browser/page_cycler/page_cycler_browsertest.cc index 3e4938f..032fd24 100644 --- a/chrome/browser/page_cycler/page_cycler_browsertest.cc +++ b/chrome/browser/page_cycler/page_cycler_browsertest.cc @@ -317,12 +317,10 @@ IN_PROC_BROWSER_TEST_F(PageCyclerBrowserTest, ChromeErrorURL) { // TODO(rdevlin.cronin): Perhaps page cycler isn't completely implemented on // ChromeOS? #else -#if defined(OS_LINUX) -// Bug 159026: Randomly fails on Linux release and debug. -#define MAYBE_PlaybackMode DISABLED_PlaybackMode -#else -#if (defined(OS_WIN) || defined(OS_MACOSX)) && !defined(NDEBUG) +#if (defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) && \ + !defined(NDEBUG) // Bug 131333: This test fails on a XP debug bot since Build 17609. +// Bug 159026: Also fails on Linux debug bot. #define MAYBE_PlaybackMode DISABLED_PlaybackMode #else #define MAYBE_PlaybackMode PlaybackMode |