diff options
| author | Allan Sandfeld Jensen <[email protected]> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <[email protected]> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/browser/oop_browsertest.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <[email protected]>
Diffstat (limited to 'chromium/content/browser/oop_browsertest.cc')
| -rw-r--r-- | chromium/content/browser/oop_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chromium/content/browser/oop_browsertest.cc b/chromium/content/browser/oop_browsertest.cc index 5f3984652f7..97cbd3e789d 100644 --- a/chromium/content/browser/oop_browsertest.cc +++ b/chromium/content/browser/oop_browsertest.cc @@ -44,7 +44,13 @@ class OOPBrowserTest : public ContentBrowserTest { // This test calls into system GL which is not instrumented with MSAN. #if !defined(MEMORY_SANITIZER) -IN_PROC_BROWSER_TEST_F(OOPBrowserTest, Basic) { +// Failing on linux-trusty-rel bot. https://crbug.com/1067662 +#if defined(OS_LINUX) +#define MAYBE_Basic DISABLED_Basic +#else +#define MAYBE_Basic Basic +#endif +IN_PROC_BROWSER_TEST_F(OOPBrowserTest, MAYBE_Basic) { // Create a div to ensure we don't use solid color quads. GURL url = GURL( "data:text/html," |