Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Side by Side Diff: chrome/test/gpu/gpu_browsertest.cc

Issue 6523005: Disabling GPUBrowserTest.BrowserTestCanLaunchWithOSMesa, it hungs way too oft... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "app/gfx/gl/gl_implementation.h" 5 #include "app/gfx/gl/gl_implementation.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 30 matching lines...) Expand all
41 // assumes GL contexts are native. 41 // assumes GL contexts are native.
42 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); 42 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
43 #endif 43 #endif
44 } 44 }
45 45
46 FilePath gpu_test_dir_; 46 FilePath gpu_test_dir_;
47 }; 47 };
48 48
49 #if defined(OS_WIN) 49 #if defined(OS_WIN)
50 // Flaky on Windows (dbg): http://crbug.com/72608 50 // Flaky on Windows (dbg): http://crbug.com/72608
51 #define MAYBE_BrowserTestCanLaunchWithOSMesa FLAKY_BrowserTestCanLaunchWithOSMes a 51 #define MAYBE_BrowserTestCanLaunchWithOSMesa DISABLED_BrowserTestCanLaunchWithOS Mesa
52 #else 52 #else
53 #define MAYBE_BrowserTestCanLaunchWithOSMesa BrowserTestCanLaunchWithOSMesa 53 #define MAYBE_BrowserTestCanLaunchWithOSMesa BrowserTestCanLaunchWithOSMesa
54 #endif 54 #endif
55 55
56 IN_PROC_BROWSER_TEST_F(GPUBrowserTest, MAYBE_BrowserTestCanLaunchWithOSMesa) { 56 IN_PROC_BROWSER_TEST_F(GPUBrowserTest, MAYBE_BrowserTestCanLaunchWithOSMesa) {
57 // Check the webgl test reports success and that the renderer was OSMesa. 57 // Check the webgl test reports success and that the renderer was OSMesa.
58 ui_test_utils::NavigateToURL( 58 ui_test_utils::NavigateToURL(
59 browser(), 59 browser(),
60 net::FilePathToFileURL(gpu_test_dir_.AppendASCII("webgl.html"))); 60 net::FilePathToFileURL(gpu_test_dir_.AppendASCII("webgl.html")));
61 61
62 EXPECT_EQ(ASCIIToUTF16("SUCCESS: Mesa OffScreen"), 62 EXPECT_EQ(ASCIIToUTF16("SUCCESS: Mesa OffScreen"),
63 browser()->GetSelectedTabContents()->GetTitle()); 63 browser()->GetSelectedTabContents()->GetTitle());
64 } 64 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698