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

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

Issue 1012143003: Disable PPAPI NaCl tests that are flaky on Mac ASan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed macro redefinition error Created 5 years, 9 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
« 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 "base/path_service.h" 5 #include "base/path_service.h"
6 #include "base/test/test_timeouts.h" 6 #include "base/test/test_timeouts.h"
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/extensions/extension_browsertest.h" 8 #include "chrome/browser/extensions/extension_browsertest.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 } 275 }
276 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) 276 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
277 // Flaky on Mac ASAN: http://crbug.com/437408 and http://crbug.com/457501. 277 // Flaky on Mac ASAN: http://crbug.com/437408 and http://crbug.com/457501.
278 #define MAYBE_TCPSocket DISABLED_TCPSocket 278 #define MAYBE_TCPSocket DISABLED_TCPSocket
279 #else 279 #else
280 #define MAYBE_TCPSocket TCPSocket 280 #define MAYBE_TCPSocket TCPSocket
281 #endif 281 #endif
282 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_TCPSocket) { 282 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_TCPSocket) {
283 RUN_TCPSOCKET_SUBTESTS; 283 RUN_TCPSOCKET_SUBTESTS;
284 } 284 }
285 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) { 285 // Flaky on Mac ASAN: http://crbug.com/437408
286 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_TCPSocket) {
286 RUN_TCPSOCKET_SUBTESTS; 287 RUN_TCPSOCKET_SUBTESTS;
287 } 288 }
288 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 289 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
289 MAYBE_PNACL_NONSFI(TCPSocket)) { 290 MAYBE_PNACL_NONSFI(TCPSocket)) {
290 RUN_TCPSOCKET_SUBTESTS; 291 RUN_TCPSOCKET_SUBTESTS;
291 } 292 }
292 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, 293 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
293 MAYBE_PNACL_TRANSITIONAL_NONSFI(TCPSocket)) { 294 MAYBE_PNACL_TRANSITIONAL_NONSFI(TCPSocket)) {
294 RUN_TCPSOCKET_SUBTESTS; 295 RUN_TCPSOCKET_SUBTESTS;
295 } 296 }
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 #define RUN_HOST_RESOLVER_SUBTESTS \ 379 #define RUN_HOST_RESOLVER_SUBTESTS \
379 RunTestViaHTTP( \ 380 RunTestViaHTTP( \
380 LIST_TEST(HostResolver_Empty) \ 381 LIST_TEST(HostResolver_Empty) \
381 LIST_TEST(HostResolver_Resolve) \ 382 LIST_TEST(HostResolver_Resolve) \
382 LIST_TEST(HostResolver_ResolveIPv4) \ 383 LIST_TEST(HostResolver_ResolveIPv4) \
383 ) 384 )
384 385
385 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, HostResolver) { 386 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, HostResolver) {
386 RUN_HOST_RESOLVER_SUBTESTS; 387 RUN_HOST_RESOLVER_SUBTESTS;
387 } 388 }
388 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, HostResolver) { 389
390 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
391 // Flaky on Mac ASAN: http://crbug.com/437408
392 #define MAYBE_HostResolver DISABLED_HostResolver
393 #else
394 #define MAYBE_HostResolver HostResolver
395 #endif
396 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_HostResolver) {
389 RUN_HOST_RESOLVER_SUBTESTS; 397 RUN_HOST_RESOLVER_SUBTESTS;
390 } 398 }
391 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, HostResolver) { 399 // Flaky on Mac ASAN: http://crbug.com/437408
400 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_HostResolver) {
392 RUN_HOST_RESOLVER_SUBTESTS; 401 RUN_HOST_RESOLVER_SUBTESTS;
393 } 402 }
394 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 403 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
395 MAYBE_PNACL_NONSFI(HostResolver)) { 404 MAYBE_PNACL_NONSFI(HostResolver)) {
396 RUN_HOST_RESOLVER_SUBTESTS; 405 RUN_HOST_RESOLVER_SUBTESTS;
397 } 406 }
398 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, 407 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
399 MAYBE_PNACL_TRANSITIONAL_NONSFI(HostResolver)) { 408 MAYBE_PNACL_TRANSITIONAL_NONSFI(HostResolver)) {
400 RUN_HOST_RESOLVER_SUBTESTS; 409 RUN_HOST_RESOLVER_SUBTESTS;
401 } 410 }
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 } 484 }
476 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader3) { 485 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader3) {
477 RUN_URLLOADER_SUBTESTS_3; 486 RUN_URLLOADER_SUBTESTS_3;
478 } 487 }
479 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoaderTrusted) { 488 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoaderTrusted) {
480 RUN_URLLOADER_TRUSTED_SUBTESTS; 489 RUN_URLLOADER_TRUSTED_SUBTESTS;
481 } 490 }
482 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, URLLoader0) { 491 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, URLLoader0) {
483 RUN_URLLOADER_SUBTESTS_0; 492 RUN_URLLOADER_SUBTESTS_0;
484 } 493 }
485 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, URLLoader1) { 494 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
495 // Flaky on Mac ASAN: http://crbug.com/437411.
496 #define MAYBE_URLLoader1 DISABLED_URLLoader1
497 #else
498 #define MAYBE_URLLoader1 URLLoader1
499 #endif
500 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_URLLoader1) {
486 RUN_URLLOADER_SUBTESTS_1; 501 RUN_URLLOADER_SUBTESTS_1;
487 } 502 }
488 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, URLLoader2) { 503 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
504 // Flaky on Mac ASAN: http://crbug.com/437411.
505 #define MAYBE_URLLoader2 DISABLED_URLLoader2
506 #else
507 #define MAYBE_URLLoader2 URLLoader2
508 #endif
509 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_URLLoader2) {
489 RUN_URLLOADER_SUBTESTS_2; 510 RUN_URLLOADER_SUBTESTS_2;
490 } 511 }
491 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) 512 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
492 // Flaky on Mac ASAN: http://crbug.com/437411. 513 // Flaky on Mac ASAN: http://crbug.com/437411.
493 #define MAYBE_URLLoader3 DISABLED_URLLoader3 514 #define MAYBE_URLLoader3 DISABLED_URLLoader3
494 #else 515 #else
495 #define MAYBE_URLLoader3 URLLoader3 516 #define MAYBE_URLLoader3 URLLoader3
496 #endif 517 #endif
497 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_URLLoader3) { 518 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_URLLoader3) {
498 RUN_URLLOADER_SUBTESTS_3; 519 RUN_URLLOADER_SUBTESTS_3;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 628
608 #if defined(OS_WIN) 629 #if defined(OS_WIN)
609 // http://crbug.com/95557 630 // http://crbug.com/95557
610 #define MAYBE_PostMessage DISABLED_PostMessage 631 #define MAYBE_PostMessage DISABLED_PostMessage
611 #else 632 #else
612 #define MAYBE_PostMessage PostMessage 633 #define MAYBE_PostMessage PostMessage
613 #endif 634 #endif
614 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_PostMessage) { 635 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_PostMessage) {
615 RUN_POSTMESSAGE_SUBTESTS; 636 RUN_POSTMESSAGE_SUBTESTS;
616 } 637 }
617 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, PostMessage) { 638
639 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
640 // Flaky on Mac ASAN: http://crbug.com/437408
641 // Suffixed by a 2 to avoid macro redefinition with the above.
642 #define MAYBE_PostMessage2 DISABLED_PostMessage
643 #else
644 #define MAYBE_PostMessage2 PostMessage
645 #endif
646 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_PostMessage2) {
618 RUN_POSTMESSAGE_SUBTESTS; 647 RUN_POSTMESSAGE_SUBTESTS;
619 } 648 }
620 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, PostMessage) { 649 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, PostMessage) {
621 RUN_POSTMESSAGE_SUBTESTS; 650 RUN_POSTMESSAGE_SUBTESTS;
622 } 651 }
623 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 652 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
624 MAYBE_PNACL_NONSFI(PostMessage)) { 653 MAYBE_PNACL_NONSFI(PostMessage)) {
625 RUN_POSTMESSAGE_SUBTESTS; 654 RUN_POSTMESSAGE_SUBTESTS;
626 } 655 }
627 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, 656 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest,
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
1430 #endif 1459 #endif
1431 1460
1432 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) { 1461 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) {
1433 RunTest(); 1462 RunTest();
1434 } 1463 }
1435 1464
1436 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) { 1465 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) {
1437 RunTestWithoutFlag(); 1466 RunTestWithoutFlag();
1438 } 1467 }
1439 #endif 1468 #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