diff options
Diffstat (limited to 'content/browser/gpu/gpu_memory_test.cc')
| -rw-r--r-- | content/browser/gpu/gpu_memory_test.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/content/browser/gpu/gpu_memory_test.cc b/content/browser/gpu/gpu_memory_test.cc index fd85739..cb74a62 100644 --- a/content/browser/gpu/gpu_memory_test.cc +++ b/content/browser/gpu/gpu_memory_test.cc @@ -215,9 +215,17 @@ class GpuMemoryTest : public ContentBrowserTest { base::FilePath gpu_test_dir_; }; +#if defined(OS_LINUX) && !defined(NDEBUG) +// http://crbug.com/254724 +#define IF_NOT_DEBUG_LINUX(x) DISABLED_ ## x +#else +#define IF_NOT_DEBUG_LINUX(x) x +#endif + // When trying to load something that doesn't fit into our total GPU memory // limit, we shouldn't exceed that limit. -IN_PROC_BROWSER_TEST_F(GpuMemoryTest, SingleWindowDoesNotExceedLimit) { +IN_PROC_BROWSER_TEST_F(GpuMemoryTest, + IF_NOT_DEBUG_LINUX(SingleWindowDoesNotExceedLimit)) { if (!AllowTestsToRun()) return; |