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

Side by Side Diff: chrome/test/nacl/nacl_browsertest.cc

Issue 2773793003: Disable NaClBrowserTestPnaclSubzero.PnaclErrorHandling on Linux (Closed)
Patch Set: Created 3 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 <stdio.h> 5 #include <stdio.h>
6 #if defined(OS_POSIX) 6 #if defined(OS_POSIX)
7 #include <unistd.h> 7 #include <unistd.h>
8 #elif defined(OS_WIN) 8 #elif defined(OS_WIN)
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDebugMasked, 368 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDebugMasked,
369 MAYBE_PNACL(PnaclDebugURLFlagMaskedOff)) { 369 MAYBE_PNACL(PnaclDebugURLFlagMaskedOff)) {
370 if (TestIsBroken()) { 370 if (TestIsBroken()) {
371 return; 371 return;
372 } 372 }
373 // If the mask excludes debugging, it's as if the flag was off. 373 // If the mask excludes debugging, it's as if the flag was off.
374 RunLoadTest(FILE_PATH_LITERAL( 374 RunLoadTest(FILE_PATH_LITERAL(
375 "pnacl_debug_url.html?nmf_file=pnacl_has_debug_flag_off.nmf")); 375 "pnacl_debug_url.html?nmf_file=pnacl_has_debug_flag_off.nmf"));
376 } 376 }
377 377
378 // NaClBrowserTestPnacl{,Subzero}.PnaclErrorHandling are flaky on Win XP. 378 // NaClBrowserTestPnacl.PnaclErrorHandling is flaky on Linux.
379 // http://crbug.com/499878 379 // http://crbug.com/704980
380 #if defined(OS_WIN) 380 #if defined(OS_LINUX)
381 #define MAYBE_PnaclErrorHandling DISABLED_PnaclErrorHandling 381 #define MAYBE_PnaclErrorHandling DISABLED_PnaclErrorHandling
382 #else 382 #else
383 #define MAYBE_PnaclErrorHandling PnaclErrorHandling 383 #define MAYBE_PnaclErrorHandling PnaclErrorHandling
384 #endif 384 #endif
385 385
386 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 386 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
387 MAYBE_PnaclErrorHandling) { 387 MAYBE_PnaclErrorHandling) {
388 RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html")); 388 RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html"));
389 } 389 }
390 390
391 // Test Subzero. Subzero is triggered by the O0 option so reuse 391 // Test Subzero. Subzero is triggered by the O0 option so reuse
392 // test harnesses that use "optlevel": 0. 392 // test harnesses that use "optlevel": 0.
393 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclSubzero, 393 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclSubzero, PnaclErrorHandling) {
394 MAYBE_PnaclErrorHandling) {
395 RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html")); 394 RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html"));
396 } 395 }
397 396
398 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 397 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
399 MAYBE_PNACL(PnaclNMFOptionsO0)) { 398 MAYBE_PNACL(PnaclNMFOptionsO0)) {
400 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0")); 399 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0"));
401 } 400 }
402 401
403 // Test Subzero. Subzero is triggered by the O0 option so reuse 402 // Test Subzero. Subzero is triggered by the O0 option so reuse
404 // test harnesses that use "optlevel": 0. 403 // test harnesses that use "optlevel": 0.
(...skipping 29 matching lines...) Expand all
434 } 433 }
435 434
436 // TODO(ncbray) support glibc and PNaCl 435 // TODO(ncbray) support glibc and PNaCl
437 // flaky: crbug.com/375894 436 // flaky: crbug.com/375894
438 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { 437 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
439 RunNaClIntegrationTest(FILE_PATH_LITERAL( 438 RunNaClIntegrationTest(FILE_PATH_LITERAL(
440 "ppapi_extension_mime_handler.html")); 439 "ppapi_extension_mime_handler.html"));
441 } 440 }
442 441
443 } // namespace 442 } // namespace
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