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

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

Issue 1157213005: Add a Subzero variant of Chrome PNaCl error handling test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make more explicit Created 5 years, 6 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 | « chrome/test/data/nacl/pnacl_error_handling/pnacl_nonfinal_pexe_O0.nmf ('k') | 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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 // If the mask excludes debugging, it's as if the flag was off. 374 // If the mask excludes debugging, it's as if the flag was off.
375 RunLoadTest(FILE_PATH_LITERAL( 375 RunLoadTest(FILE_PATH_LITERAL(
376 "pnacl_debug_url.html?nmf_file=pnacl_has_debug_flag_off.nmf")); 376 "pnacl_debug_url.html?nmf_file=pnacl_has_debug_flag_off.nmf"));
377 } 377 }
378 378
379 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 379 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
380 MAYBE_PNACL(PnaclErrorHandling)) { 380 MAYBE_PNACL(PnaclErrorHandling)) {
381 RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html")); 381 RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html"));
382 } 382 }
383 383
384 // Test Subzero. Subzero is triggered by the O0 option so reuse
385 // test harnesses that use "optlevel": 0.
386 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclSubzero,
387 MAYBE_PNACL(PnaclErrorHandling)) {
388 RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html"));
389 }
390
384 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 391 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
385 MAYBE_PNACL(PnaclNMFOptionsO0)) { 392 MAYBE_PNACL(PnaclNMFOptionsO0)) {
386 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0")); 393 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0"));
387 } 394 }
388 395
389 // Test Subzero. Subzero is triggered by the O0 option so reuse that test 396 // Test Subzero. Subzero is triggered by the O0 option so reuse
390 // pexe and test harness. 397 // test harnesses that use "optlevel": 0.
391 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclSubzero, 398 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclSubzero,
392 MAYBE_PNACL(PnaclNMFOptionsO0)) { 399 MAYBE_PNACL(PnaclNMFOptionsO0)) {
393 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0")); 400 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0"));
394 } 401 }
395 402
396 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 403 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
397 MAYBE_PNACL(PnaclNMFOptionsO2)) { 404 MAYBE_PNACL(PnaclNMFOptionsO2)) {
398 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_2")); 405 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_2"));
399 } 406 }
400 407
(...skipping 19 matching lines...) Expand all
420 } 427 }
421 428
422 // TODO(ncbray) support glibc and PNaCl 429 // TODO(ncbray) support glibc and PNaCl
423 // flaky: crbug.com/375894 430 // flaky: crbug.com/375894
424 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { 431 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
425 RunNaClIntegrationTest(FILE_PATH_LITERAL( 432 RunNaClIntegrationTest(FILE_PATH_LITERAL(
426 "ppapi_extension_mime_handler.html")); 433 "ppapi_extension_mime_handler.html"));
427 } 434 }
428 435
429 } // namespace 436 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/data/nacl/pnacl_error_handling/pnacl_nonfinal_pexe_O0.nmf ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698