diff options
| author | junov <junov@chromium.org> | 2015-11-13 06:07:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 14:08:16 +0000 |
| commit | 1c4a2976fcadf99d325cdb13f49323e4a924f46b (patch) | |
| tree | fc508244d663ba9c60da297821e8124a2220bb82 /content | |
| parent | 1a08fc55b0b2775fc246d33acf5b3ca22a6b79b9 (diff) | |
| download | chromium_src-1c4a2976fcadf99d325cdb13f49323e4a924f46b.zip chromium_src-1c4a2976fcadf99d325cdb13f49323e4a924f46b.tar.gz chromium_src-1c4a2976fcadf99d325cdb13f49323e4a924f46b.tar.bz2 | |
Disabling BrowserGpuChannelHostFactoryTest.GrContextKeepsGpuChannelAlive on Mac
Test is failing on Mac 10.6 bot.
BUG=551143
TBR=rfevang@chromium.org, loyso@chromium.org, mgiuca@chromium.org
Review URL: https://codereview.chromium.org/1441333002
Cr-Commit-Position: refs/heads/master@{#359544}
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/gpu/gpu_ipc_browsertests.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc index 932375b..1a09b24 100644 --- a/content/browser/gpu/gpu_ipc_browsertests.cc +++ b/content/browser/gpu/gpu_ipc_browsertests.cc @@ -197,8 +197,10 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest, } #endif -// Test fails on Windows because GPU Channel set-up does not work. -#if !defined(OS_WIN) +// Test fails on Windows because GPU Channel set-up fails. +// Mac only fails GPU set-up on MacOS 10.6, but we have no version-specific +// macros for disabling tests. +#if !defined(OS_WIN) && !defined(OS_MACOSX) #define MAYBE_GrContextKeepsGpuChannelAlive GrContextKeepsGpuChannelAlive #else #define MAYBE_GrContextKeepsGpuChannelAlive \ |