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

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
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | 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 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(NaClBrowserTestTransitionalNonSfi,
46 MAYBE_TRANSITIONAL_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(NaClBrowserTestTransitionalNonSfi,
55 MAYBE_TRANSITIONAL_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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 FILE_PATH_LITERAL("ppapi_crash_ppapi_off_main_thread.html")); 157 FILE_PATH_LITERAL("ppapi_crash_ppapi_off_main_thread.html"));
148 }) 158 })
149 159
150 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { 160 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) {
151 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); 161 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
152 } 162 }
153 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, 163 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
154 MAYBE_PNACL_NONSFI(IrtManifestFile)) { 164 MAYBE_PNACL_NONSFI(IrtManifestFile)) {
155 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); 165 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
156 } 166 }
167 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclTransitionalNonSfi,
168 MAYBE_PNACL_TRANSITIONAL_NONSFI(IrtManifestFile)) {
169 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
170 }
157 171
158 #if defined(OS_WIN) 172 #if defined(OS_WIN)
159 // http://crbug.com/416272 173 // http://crbug.com/416272
160 #define MAYBE_IrtException DISABLED_IrtException 174 #define MAYBE_IrtException DISABLED_IrtException
161 #else 175 #else
162 #define MAYBE_IrtException IrtException 176 #define MAYBE_IrtException IrtException
163 #endif 177 #endif
164 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) { 178 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) {
165 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); 179 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
166 } 180 }
167 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, 181 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
168 MAYBE_PNACL_NONSFI(IrtException)) { 182 MAYBE_PNACL_NONSFI(IrtException)) {
169 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); 183 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
170 } 184 }
185 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclTransitionalNonSfi,
186 MAYBE_PNACL_TRANSITIONAL_NONSFI(IrtException)) {
187 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
188 }
171 189
172 // Some versions of Visual Studio does not like preprocessor 190 // Some versions of Visual Studio does not like preprocessor
173 // conditionals inside the argument of a macro, so we put the 191 // conditionals inside the argument of a macro, so we put the
174 // conditionals on a helper function. We are already in an anonymous 192 // conditionals on a helper function. We are already in an anonymous
175 // namespace, so the name of the helper is not visible in external 193 // namespace, so the name of the helper is not visible in external
176 // scope. 194 // scope.
177 #if defined(OS_POSIX) 195 #if defined(OS_POSIX)
178 base::FilePath::StringType NumberOfCoresAsFilePathString() { 196 base::FilePath::StringType NumberOfCoresAsFilePathString() {
179 char string_rep[23]; 197 char string_rep[23];
180 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN); 198 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN);
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 } 412 }
395 413
396 // TODO(ncbray) support glibc and PNaCl 414 // TODO(ncbray) support glibc and PNaCl
397 // flaky: crbug.com/375894 415 // flaky: crbug.com/375894
398 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { 416 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
399 RunNaClIntegrationTest(FILE_PATH_LITERAL( 417 RunNaClIntegrationTest(FILE_PATH_LITERAL(
400 "ppapi_extension_mime_handler.html")); 418 "ppapi_extension_mime_handler.html"));
401 } 419 }
402 420
403 } // namespace 421 } // namespace
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698