OLD | NEW |
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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 }) | 145 }) |
146 | 146 |
147 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashPPAPIOffMainThread, { | 147 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashPPAPIOffMainThread, { |
148 RunNaClIntegrationTest( | 148 RunNaClIntegrationTest( |
149 FILE_PATH_LITERAL("ppapi_crash_ppapi_off_main_thread.html")); | 149 FILE_PATH_LITERAL("ppapi_crash_ppapi_off_main_thread.html")); |
150 }) | 150 }) |
151 | 151 |
152 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { | 152 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { |
153 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 153 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
154 } | 154 } |
155 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, | 155 #if defined(OS_LINUX) |
156 MAYBE_PNACL_NONSFI(IrtManifestFile)) { | 156 // http://crbug.com/579804 |
| 157 #define MAYBE_IrtManifestFile DISABLED_IrtManifestFile |
| 158 #else |
| 159 #define MAYBE_IrtManifestFile MAYBE_PNACL_NONSFI(IrtManifestFile) |
| 160 #endif |
| 161 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, MAYBE_IrtManifestFile) { |
157 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 162 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
158 } | 163 } |
159 | 164 |
160 #if defined(OS_WIN) | 165 #if defined(OS_WIN) |
161 // http://crbug.com/416272 | 166 // http://crbug.com/416272 |
162 #define MAYBE_IrtException DISABLED_IrtException | 167 #define MAYBE_IrtException DISABLED_IrtException |
163 #else | 168 #else |
164 #define MAYBE_IrtException IrtException | 169 #define MAYBE_IrtException IrtException |
165 #endif | 170 #endif |
166 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) { | 171 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) { |
167 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); | 172 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
168 } | 173 } |
169 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, | 174 #if defined(OS_LINUX) |
170 MAYBE_PNACL_NONSFI(IrtException)) { | 175 // http://crbug.com/579804 |
| 176 #define MAYBE_IrtException2 DISABLED_IrtException |
| 177 #else |
| 178 #define MAYBE_IrtException2 MAYBE_PNACL_NONSFI(IrtException) |
| 179 #endif |
| 180 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, MAYBE_IrtException2) { |
171 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); | 181 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
172 } | 182 } |
173 | 183 |
174 // Some versions of Visual Studio does not like preprocessor | 184 // Some versions of Visual Studio does not like preprocessor |
175 // conditionals inside the argument of a macro, so we put the | 185 // conditionals inside the argument of a macro, so we put the |
176 // conditionals on a helper function. We are already in an anonymous | 186 // conditionals on a helper function. We are already in an anonymous |
177 // namespace, so the name of the helper is not visible in external | 187 // namespace, so the name of the helper is not visible in external |
178 // scope. | 188 // scope. |
179 #if defined(OS_POSIX) | 189 #if defined(OS_POSIX) |
180 base::FilePath::StringType NumberOfCoresAsFilePathString() { | 190 base::FilePath::StringType NumberOfCoresAsFilePathString() { |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 } | 428 } |
419 | 429 |
420 // TODO(ncbray) support glibc and PNaCl | 430 // TODO(ncbray) support glibc and PNaCl |
421 // flaky: crbug.com/375894 | 431 // flaky: crbug.com/375894 |
422 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { | 432 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { |
423 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 433 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
424 "ppapi_extension_mime_handler.html")); | 434 "ppapi_extension_mime_handler.html")); |
425 } | 435 } |
426 | 436 |
427 } // namespace | 437 } // namespace |
OLD | NEW |