| 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 }) | 115 }) |
| 116 | 116 |
| 117 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { | 117 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { |
| 118 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 118 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
| 119 } | 119 } |
| 120 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, | 120 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, |
| 121 MAYBE_PNACL_NONSFI(IrtManifestFile)) { | 121 MAYBE_PNACL_NONSFI(IrtManifestFile)) { |
| 122 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 122 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
| 123 } | 123 } |
| 124 | 124 |
| 125 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) { | 125 #if defined(OS_WIN) |
| 126 // http://crbug.com/416272 |
| 127 #define MAYBE_IrtException DISABLED_IrtException |
| 128 #else |
| 129 #define MAYBE_IrtException IrtException |
| 130 #endif |
| 131 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) { |
| 126 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); | 132 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
| 127 } | 133 } |
| 128 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, | 134 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, |
| 129 MAYBE_PNACL_NONSFI(IrtException)) { | 135 MAYBE_PNACL_NONSFI(IrtException)) { |
| 130 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); | 136 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
| 131 } | 137 } |
| 132 | 138 |
| 133 // Some versions of Visual Studio does not like preprocessor | 139 // Some versions of Visual Studio does not like preprocessor |
| 134 // conditionals inside the argument of a macro, so we put the | 140 // conditionals inside the argument of a macro, so we put the |
| 135 // conditionals on a helper function. We are already in an anonymous | 141 // conditionals on a helper function. We are already in an anonymous |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 } | 361 } |
| 356 | 362 |
| 357 // TODO(ncbray) support glibc and PNaCl | 363 // TODO(ncbray) support glibc and PNaCl |
| 358 // flaky: crbug.com/375894 | 364 // flaky: crbug.com/375894 |
| 359 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { | 365 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { |
| 360 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 366 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 361 "ppapi_extension_mime_handler.html")); | 367 "ppapi_extension_mime_handler.html")); |
| 362 } | 368 } |
| 363 | 369 |
| 364 } // namespace | 370 } // namespace |
| OLD | NEW |