| 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 "pm_pre_init_manifest_file_test.html")); | 137 "pm_pre_init_manifest_file_test.html")); |
| 138 } | 138 } |
| 139 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) { | 139 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) { |
| 140 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 140 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 141 "pm_pre_init_manifest_file_test.html")); | 141 "pm_pre_init_manifest_file_test.html")); |
| 142 } | 142 } |
| 143 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { | 143 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { |
| 144 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 144 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
| 145 } | 145 } |
| 146 | 146 |
| 147 // The NonSFI test is currently available only on linux-x86-32 |
| 148 // architecture. |
| 149 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) |
| 150 #define MAYBE_NONSFI(test_name) test_name |
| 151 #else |
| 152 #define MAYBE_NONSFI(test_name) DISABLED_##test_name |
| 153 #endif |
| 154 |
| 155 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) { |
| 156 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
| 157 } |
| 158 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, |
| 159 MAYBE_NONSFI(IrtException)) { |
| 160 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
| 161 } |
| 162 |
| 147 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, { | 163 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, { |
| 148 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html")); | 164 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html")); |
| 149 }) | 165 }) |
| 150 | 166 |
| 151 // Some versions of Visual Studio does not like preprocessor | 167 // Some versions of Visual Studio does not like preprocessor |
| 152 // conditionals inside the argument of a macro, so we put the | 168 // conditionals inside the argument of a macro, so we put the |
| 153 // conditionals on a helper function. We are already in an anonymous | 169 // conditionals on a helper function. We are already in an anonymous |
| 154 // namespace, so the name of the helper is not visible in external | 170 // namespace, so the name of the helper is not visible in external |
| 155 // scope. | 171 // scope. |
| 156 #if defined(OS_POSIX) | 172 #if defined(OS_POSIX) |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 } | 471 } |
| 456 }; | 472 }; |
| 457 | 473 |
| 458 // TODO(ncbray) support glibc and PNaCl | 474 // TODO(ncbray) support glibc and PNaCl |
| 459 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { | 475 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { |
| 460 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 476 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 461 "ppapi_extension_mime_handler.html")); | 477 "ppapi_extension_mime_handler.html")); |
| 462 } | 478 } |
| 463 | 479 |
| 464 } // namespace | 480 } // namespace |
| OLD | NEW |