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

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 59703009: Disable PPAPINaClGLibcTest.Graphics2D_FlushOffscreenUpdate on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/browser/content_settings/host_content_settings_map.h" 9 #include "chrome/browser/content_settings/host_content_settings_map.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 RunTest("Instance_SetupExecuteScriptAtInstanceShutdown"); 269 RunTest("Instance_SetupExecuteScriptAtInstanceShutdown");
270 RunTest("Instance_ExecuteScriptAtInstanceShutdown"); 270 RunTest("Instance_ExecuteScriptAtInstanceShutdown");
271 } 271 }
272 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, 272 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest,
273 Instance_ExecuteScriptAtInstanceShutdown) { 273 Instance_ExecuteScriptAtInstanceShutdown) {
274 // (See the comment for the in-process version of this test above) 274 // (See the comment for the in-process version of this test above)
275 RunTest("Instance_SetupExecuteScriptAtInstanceShutdown"); 275 RunTest("Instance_SetupExecuteScriptAtInstanceShutdown");
276 RunTest("Instance_ExecuteScriptAtInstanceShutdown"); 276 RunTest("Instance_ExecuteScriptAtInstanceShutdown");
277 } 277 }
278 278
279 #if defined(OS_WIN)
280 // Flaky on Win7. http://crbug.com/320548
281 #define MAYBE_Graphics2D_FlushOffscreenUpdate \
282 DISABLED_Graphics2D_FlushOffscreenUpdate
283 #else
284 #define MAYBE_Graphics2D_FlushOffscreenUpdate Graphics2D_FlushOffscreenUpdate
285 #endif
286
279 TEST_PPAPI_IN_PROCESS(Graphics2D) 287 TEST_PPAPI_IN_PROCESS(Graphics2D)
280 TEST_PPAPI_OUT_OF_PROCESS(Graphics2D) 288 TEST_PPAPI_OUT_OF_PROCESS(Graphics2D)
281 // Graphics2D_Dev isn't supported in NaCl, only test the other interfaces 289 // Graphics2D_Dev isn't supported in NaCl, only test the other interfaces
282 // TODO(jhorwich) Enable when Graphics2D_Dev interfaces are proxied in NaCl. 290 // TODO(jhorwich) Enable when Graphics2D_Dev interfaces are proxied in NaCl.
283 TEST_PPAPI_NACL(Graphics2D_InvalidResource) 291 TEST_PPAPI_NACL(Graphics2D_InvalidResource)
284 TEST_PPAPI_NACL(Graphics2D_InvalidSize) 292 TEST_PPAPI_NACL(Graphics2D_InvalidSize)
285 TEST_PPAPI_NACL(Graphics2D_Humongous) 293 TEST_PPAPI_NACL(Graphics2D_Humongous)
286 TEST_PPAPI_NACL(Graphics2D_InitToZero) 294 TEST_PPAPI_NACL(Graphics2D_InitToZero)
287 TEST_PPAPI_NACL(Graphics2D_Describe) 295 TEST_PPAPI_NACL(Graphics2D_Describe)
288 TEST_PPAPI_NACL(Graphics2D_Paint) 296 TEST_PPAPI_NACL(Graphics2D_Paint)
289 TEST_PPAPI_NACL(Graphics2D_Scroll) 297 TEST_PPAPI_NACL(Graphics2D_Scroll)
290 TEST_PPAPI_NACL(Graphics2D_Replace) 298 TEST_PPAPI_NACL(Graphics2D_Replace)
291 TEST_PPAPI_NACL(Graphics2D_Flush) 299 TEST_PPAPI_NACL(Graphics2D_Flush)
292 TEST_PPAPI_NACL(Graphics2D_FlushOffscreenUpdate) 300 TEST_PPAPI_NACL(MAYBE_Graphics2D_FlushOffscreenUpdate)
293 TEST_PPAPI_NACL(Graphics2D_BindNull) 301 TEST_PPAPI_NACL(Graphics2D_BindNull)
294 302
295 #if defined(OS_WIN) 303 #if defined(OS_WIN)
296 #if defined(USE_AURA) 304 #if defined(USE_AURA)
297 // These tests fail with the test compositor which is what's used by default for 305 // These tests fail with the test compositor which is what's used by default for
298 // browser tests on Windows Aura. Renable when the software compositor is 306 // browser tests on Windows Aura. Renable when the software compositor is
299 // available. 307 // available.
300 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D 308 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D
301 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D 309 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D
302 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D 310 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D
(...skipping 1314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1617 LIST_TEST(FlashDRM_GetHmonitor) 1625 LIST_TEST(FlashDRM_GetHmonitor)
1618 LIST_TEST(FlashDRM_GetVoucherFile)); 1626 LIST_TEST(FlashDRM_GetVoucherFile));
1619 } 1627 }
1620 1628
1621 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1629 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1622 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1630 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
1623 1631
1624 #if defined(OS_CHROMEOS) 1632 #if defined(OS_CHROMEOS)
1625 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) 1633 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
1626 #endif 1634 #endif
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