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

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

Issue 1005173006: Add a switch for using PNaCl Subzero and use it for -O0 translation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stuff 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
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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 # define MAYBE_CrashInCallback CrashInCallback 135 # define MAYBE_CrashInCallback CrashInCallback
136 # define MAYBE_CrashOffMainThread CrashOffMainThread 136 # define MAYBE_CrashOffMainThread CrashOffMainThread
137 # define MAYBE_CrashPPAPIOffMainThread CrashPPAPIOffMainThread 137 # define MAYBE_CrashPPAPIOffMainThread CrashPPAPIOffMainThread
138 #endif 138 #endif
139 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashViaCheckFailure, { 139 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashViaCheckFailure, {
140 RunNaClIntegrationTest( 140 RunNaClIntegrationTest(
141 FILE_PATH_LITERAL("ppapi_crash_via_check_failure.html")); 141 FILE_PATH_LITERAL("ppapi_crash_via_check_failure.html"));
142 }) 142 })
143 143
144 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashViaExitCall, { 144 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashViaExitCall, {
145 RunNaClIntegrationTest( FILE_PATH_LITERAL("ppapi_crash_via_exit_call.html")); 145 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash_via_exit_call.html"));
146 }) 146 })
147 147
148 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashInCallback, { 148 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashInCallback, {
149 RunNaClIntegrationTest( FILE_PATH_LITERAL("ppapi_crash_in_callback.html")); 149 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash_in_callback.html"));
150 }) 150 })
151 151
152 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashOffMainThread, { 152 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashOffMainThread, {
153 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash_off_main_thread.html")); 153 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash_off_main_thread.html"));
154 }) 154 })
155 155
156 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashPPAPIOffMainThread, { 156 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashPPAPIOffMainThread, {
157 RunNaClIntegrationTest( 157 RunNaClIntegrationTest(
158 FILE_PATH_LITERAL("ppapi_crash_ppapi_off_main_thread.html")); 158 FILE_PATH_LITERAL("ppapi_crash_ppapi_off_main_thread.html"));
159 }) 159 })
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 389 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
390 MAYBE_PNACL(PnaclNMFOptionsO2)) { 390 MAYBE_PNACL(PnaclNMFOptionsO2)) {
391 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_2")); 391 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_2"));
392 } 392 }
393 393
394 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 394 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
395 MAYBE_PNACL(PnaclNMFOptionsOlarge)) { 395 MAYBE_PNACL(PnaclNMFOptionsOlarge)) {
396 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_large")); 396 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_large"));
397 } 397 }
398 398
399 // Test Subzero. Subzero is triggered by the O0 option so reuse that test
400 // pexe and test harness.
401 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclSubzero,
Nick Bray (chromium) 2015/03/27 20:30:42 Put this next to the original so the diff is more
jvoung (off chromium) 2015/03/28 01:18:34 Done.
402 MAYBE_PNACL(PnaclNMFOptionsO0)) {
403 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0"));
Nick Bray (chromium) 2015/03/27 20:30:42 Naively, I would have expected this tests to do so
jvoung (off chromium) 2015/03/28 01:18:34 Good point. I could make a separate pexe, or I co
404 }
405
399 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 406 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
400 MAYBE_PNACL(PnaclDyncodeSyscallDisabled)) { 407 MAYBE_PNACL(PnaclDyncodeSyscallDisabled)) {
401 RunNaClIntegrationTest(FILE_PATH_LITERAL( 408 RunNaClIntegrationTest(FILE_PATH_LITERAL(
402 "pnacl_dyncode_syscall_disabled.html")); 409 "pnacl_dyncode_syscall_disabled.html"));
403 } 410 }
404 411
405 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 412 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
406 MAYBE_PNACL(PnaclExceptionHandlingDisabled)) { 413 MAYBE_PNACL(PnaclExceptionHandlingDisabled)) {
407 RunNaClIntegrationTest(FILE_PATH_LITERAL( 414 RunNaClIntegrationTest(FILE_PATH_LITERAL(
408 "pnacl_hw_eh_disabled.html")); 415 "pnacl_hw_eh_disabled.html"));
409 } 416 }
410 417
411 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) { 418 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) {
412 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); 419 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
413 } 420 }
414 421
415 // TODO(ncbray) support glibc and PNaCl 422 // TODO(ncbray) support glibc and PNaCl
416 // flaky: crbug.com/375894 423 // flaky: crbug.com/375894
417 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { 424 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
418 RunNaClIntegrationTest(FILE_PATH_LITERAL( 425 RunNaClIntegrationTest(FILE_PATH_LITERAL(
419 "ppapi_extension_mime_handler.html")); 426 "ppapi_extension_mime_handler.html"));
420 } 427 }
421 428
422 } // namespace 429 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698