Index: chrome/test/nacl/nacl_browsertest.cc |
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc |
index bfacf17e206eb55b865b748efb3befe6ed9cb220..92ace7a10f2ae279fd8b13e5305b3ba31f88221d 100644 |
--- a/chrome/test/nacl/nacl_browsertest.cc |
+++ b/chrome/test/nacl/nacl_browsertest.cc |
@@ -142,11 +142,11 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashViaCheckFailure, { |
}) |
NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashViaExitCall, { |
- RunNaClIntegrationTest( FILE_PATH_LITERAL("ppapi_crash_via_exit_call.html")); |
+ RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash_via_exit_call.html")); |
}) |
NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashInCallback, { |
- RunNaClIntegrationTest( FILE_PATH_LITERAL("ppapi_crash_in_callback.html")); |
+ RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash_in_callback.html")); |
}) |
NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashOffMainThread, { |
@@ -396,6 +396,13 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_large")); |
} |
+// Test Subzero. Subzero is triggered by the O0 option so reuse that test |
+// pexe and test harness. |
+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.
|
+ MAYBE_PNACL(PnaclNMFOptionsO0)) { |
+ 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
|
+} |
+ |
IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
MAYBE_PNACL(PnaclDyncodeSyscallDisabled)) { |
RunNaClIntegrationTest(FILE_PATH_LITERAL( |