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

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

Issue 724323002: Non-SFI mode: Enable browser_tests for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 24 matching lines...) Expand all
35 #endif 35 #endif
36 36
37 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, { 37 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, {
38 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); 38 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html"));
39 }) 39 })
40 40
41 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Messaging)) { 41 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Messaging)) {
42 RunLoadTest(FILE_PATH_LITERAL("libc_free.html")); 42 RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
43 } 43 }
44 44
45 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNaClHelperNonSfi,
46 MAYBE_NACL_HELPER_NONSFI(Messaging)) {
47 RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
48 }
49
45 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) { 50 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) {
46 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html")); 51 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
47 } 52 }
48 53
54 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNaClHelperNonSfi,
55 MAYBE_NACL_HELPER_NONSFI(Irt)) {
56 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
57 }
58
49 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, { 59 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, {
50 RunNaClIntegrationTest(FILE_PATH_LITERAL( 60 RunNaClIntegrationTest(FILE_PATH_LITERAL(
51 "pm_exit_status_test.html?trigger=exit0&expected_exit=0")); 61 "pm_exit_status_test.html?trigger=exit0&expected_exit=0"));
52 }) 62 })
53 63
54 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus254, { 64 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus254, {
55 RunNaClIntegrationTest(FILE_PATH_LITERAL( 65 RunNaClIntegrationTest(FILE_PATH_LITERAL(
56 "pm_exit_status_test.html?trigger=exit254&expected_exit=254")); 66 "pm_exit_status_test.html?trigger=exit254&expected_exit=254"));
57 }) 67 })
58 68
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html")); 130 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html"));
121 }) 131 })
122 132
123 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { 133 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) {
124 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); 134 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
125 } 135 }
126 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, 136 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
127 MAYBE_PNACL_NONSFI(IrtManifestFile)) { 137 MAYBE_PNACL_NONSFI(IrtManifestFile)) {
128 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); 138 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
129 } 139 }
140 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNaClHelperNonSfi,
141 MAYBE_PNACL_NACL_HELPER_NONSFI(IrtManifestFile)) {
142 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
143 }
130 144
131 #if defined(OS_WIN) 145 #if defined(OS_WIN)
132 // http://crbug.com/416272 146 // http://crbug.com/416272
133 #define MAYBE_IrtException DISABLED_IrtException 147 #define MAYBE_IrtException DISABLED_IrtException
134 #else 148 #else
135 #define MAYBE_IrtException IrtException 149 #define MAYBE_IrtException IrtException
136 #endif 150 #endif
137 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) { 151 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) {
138 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); 152 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
139 } 153 }
140 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, 154 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
141 MAYBE_PNACL_NONSFI(IrtException)) { 155 MAYBE_PNACL_NONSFI(IrtException)) {
142 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); 156 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
143 } 157 }
158 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNaClHelperNonSfi,
159 MAYBE_PNACL_NACL_HELPER_NONSFI(IrtException)) {
160 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
161 }
144 162
145 // Some versions of Visual Studio does not like preprocessor 163 // Some versions of Visual Studio does not like preprocessor
146 // conditionals inside the argument of a macro, so we put the 164 // conditionals inside the argument of a macro, so we put the
147 // conditionals on a helper function. We are already in an anonymous 165 // conditionals on a helper function. We are already in an anonymous
148 // namespace, so the name of the helper is not visible in external 166 // namespace, so the name of the helper is not visible in external
149 // scope. 167 // scope.
150 #if defined(OS_POSIX) 168 #if defined(OS_POSIX)
151 base::FilePath::StringType NumberOfCoresAsFilePathString() { 169 base::FilePath::StringType NumberOfCoresAsFilePathString() {
152 char string_rep[23]; 170 char string_rep[23];
153 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN); 171 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN);
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 } 385 }
368 386
369 // TODO(ncbray) support glibc and PNaCl 387 // TODO(ncbray) support glibc and PNaCl
370 // flaky: crbug.com/375894 388 // flaky: crbug.com/375894
371 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { 389 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
372 RunNaClIntegrationTest(FILE_PATH_LITERAL( 390 RunNaClIntegrationTest(FILE_PATH_LITERAL(
373 "ppapi_extension_mime_handler.html")); 391 "ppapi_extension_mime_handler.html"));
374 } 392 }
375 393
376 } // namespace 394 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698