Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 222 TEST_PPAPI_NACL(Graphics2D_InitToZero) | 222 TEST_PPAPI_NACL(Graphics2D_InitToZero) |
| 223 TEST_PPAPI_NACL(Graphics2D_Describe) | 223 TEST_PPAPI_NACL(Graphics2D_Describe) |
| 224 TEST_PPAPI_NACL(Graphics2D_Paint) | 224 TEST_PPAPI_NACL(Graphics2D_Paint) |
| 225 TEST_PPAPI_NACL(Graphics2D_Scroll) | 225 TEST_PPAPI_NACL(Graphics2D_Scroll) |
| 226 TEST_PPAPI_NACL(Graphics2D_Replace) | 226 TEST_PPAPI_NACL(Graphics2D_Replace) |
| 227 TEST_PPAPI_NACL(Graphics2D_Flush) | 227 TEST_PPAPI_NACL(Graphics2D_Flush) |
| 228 TEST_PPAPI_NACL(Graphics2D_FlushOffscreenUpdate) | 228 TEST_PPAPI_NACL(Graphics2D_FlushOffscreenUpdate) |
| 229 TEST_PPAPI_NACL(Graphics2D_BindNull) | 229 TEST_PPAPI_NACL(Graphics2D_BindNull) |
| 230 | 230 |
| 231 #if defined(OS_WIN) | 231 #if defined(OS_WIN) |
| 232 #if defined(USE_AURA) | 232 #define MAYBE_IN_Graphics3D Graphics3D |
| 233 // These tests fail with the test compositor which is what's used by default for | |
| 234 // browser tests on Windows Aura. Renable when the software compositor is | |
| 235 // available. | |
| 236 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D | |
| 237 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D | |
| 238 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D | |
| 239 #else // defined(USE_AURA) | |
| 240 // In-process and NaCl tests are having flaky failures on Win: crbug.com/242252 | |
| 241 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D | |
| 242 #define MAYBE_OUT_Graphics3D Graphics3D | 233 #define MAYBE_OUT_Graphics3D Graphics3D |
| 243 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D | 234 #define MAYBE_NACL_Graphics3D Graphics3D |
| 244 #endif // defined(USE_AURA) | |
| 245 #elif defined(OS_MACOSX) | 235 #elif defined(OS_MACOSX) |
| 246 // These tests fail when using the legacy software mode. Reenable when the | 236 #define MAYBE_IN_Graphics3D Graphics3D |
| 247 // software compositor is enabled crbug.com/286038 | 237 #define MAYBE_OUT_Graphics3D Graphics3D |
| 248 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D | 238 #define MAYBE_NACL_Graphics3D Graphics3D |
| 249 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D | |
| 250 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D | |
| 251 #else | 239 #else |
| 252 // The tests are failing in-process. crbug.com/280282 | 240 // The tests are failing in-process. crbug.com/280282 |
| 253 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D | 241 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D |
| 254 #define MAYBE_OUT_Graphics3D Graphics3D | 242 #define MAYBE_OUT_Graphics3D Graphics3D |
| 255 #define MAYBE_NACL_Graphics3D Graphics3D | 243 #define MAYBE_NACL_Graphics3D Graphics3D |
| 256 #endif | 244 #endif |
| 257 TEST_PPAPI_IN_PROCESS(MAYBE_IN_Graphics3D) | 245 TEST_PPAPI_IN_PROCESS(MAYBE_IN_Graphics3D) |
| 258 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_OUT_Graphics3D) | 246 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_OUT_Graphics3D) |
| 259 TEST_PPAPI_NACL(MAYBE_NACL_Graphics3D) | 247 TEST_PPAPI_NACL(MAYBE_NACL_Graphics3D) |
|
raymes
2014/06/20 00:12:52
Looks like MAYBE_NACL_Graphics3D is always defined
| |
| 260 | 248 |
| 261 TEST_PPAPI_NACL(ImageData) | 249 TEST_PPAPI_NACL(ImageData) |
| 262 | 250 |
| 263 // TCPSocket and TCPSocketPrivate tests. | 251 // TCPSocket and TCPSocketPrivate tests. |
| 264 #define RUN_TCPSOCKET_SUBTESTS \ | 252 #define RUN_TCPSOCKET_SUBTESTS \ |
| 265 RunTestViaHTTP( \ | 253 RunTestViaHTTP( \ |
| 266 LIST_TEST(TCPSocket_Connect) \ | 254 LIST_TEST(TCPSocket_Connect) \ |
| 267 LIST_TEST(TCPSocket_ReadWrite) \ | 255 LIST_TEST(TCPSocket_ReadWrite) \ |
| 268 LIST_TEST(TCPSocket_SetOption) \ | 256 LIST_TEST(TCPSocket_SetOption) \ |
| 269 LIST_TEST(TCPSocket_Listen) \ | 257 LIST_TEST(TCPSocket_Listen) \ |
| (...skipping 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1275 LIST_TEST(FlashDRM_GetHmonitor) | 1263 LIST_TEST(FlashDRM_GetHmonitor) |
| 1276 LIST_TEST(FlashDRM_GetVoucherFile)); | 1264 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1277 } | 1265 } |
| 1278 | 1266 |
| 1279 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1267 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1280 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1268 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1281 | 1269 |
| 1282 #if defined(OS_CHROMEOS) | 1270 #if defined(OS_CHROMEOS) |
| 1283 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1271 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1284 #endif | 1272 #endif |
| OLD | NEW |