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

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

Issue 8678030: Mark GpuFeatureTest.WebGLAlloweda as DISABLED_ on Linux, as it crashes/times out (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/test/trace_event_analyzer.h" 8 #include "base/test/trace_event_analyzer.h"
9 #include "base/version.h" 9 #include "base/version.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 flags.flags(), 95 flags.flags(),
96 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAcceleratedCompositing)); 96 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAcceleratedCompositing));
97 97
98 const bool expect_gpu_process = false; 98 const bool expect_gpu_process = false;
99 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); 99 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
100 RunTest(url, expect_gpu_process); 100 RunTest(url, expect_gpu_process);
101 } 101 }
102 102
103 #if defined(OS_LINUX) 103 #if defined(OS_LINUX)
104 // http://crbug.com/104142 104 // http://crbug.com/104142
105 #define WebGLAllowed FLAKY_WebGLAllowed 105 #define MAYBE_WebGLAllowed DISABLED_WebGLAllowed
106 #else
107 #define MAYBE_WebGLAllowed WebGLAllowed
106 #endif 108 #endif
107 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) { 109 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLAllowed) {
108 GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags(); 110 GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
109 EXPECT_EQ(flags.flags(), 0u); 111 EXPECT_EQ(flags.flags(), 0u);
110 112
111 const bool expect_gpu_process = true; 113 const bool expect_gpu_process = true;
112 const FilePath url(FILE_PATH_LITERAL("feature_webgl.html")); 114 const FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
113 RunTest(url, expect_gpu_process); 115 RunTest(url, expect_gpu_process);
114 } 116 }
115 117
116 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) { 118 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) {
117 const std::string json_blacklist = 119 const std::string json_blacklist =
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 flags.flags(), 178 flags.flags(),
177 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas)); 179 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas));
178 180
179 const bool expect_gpu_process = false; 181 const bool expect_gpu_process = false;
180 const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); 182 const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
181 RunTest(url, expect_gpu_process); 183 RunTest(url, expect_gpu_process);
182 } 184 }
183 185
184 } // namespace anonymous 186 } // namespace anonymous
185 187
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