| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 "pm_pre_init_manifest_file_test.html")); | 128 "pm_pre_init_manifest_file_test.html")); |
| 129 } | 129 } |
| 130 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, | 130 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, |
| 131 MAYBE_GLIBC(PreInitManifestFile)) { | 131 MAYBE_GLIBC(PreInitManifestFile)) { |
| 132 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 132 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 133 "pm_pre_init_manifest_file_test.html")); | 133 "pm_pre_init_manifest_file_test.html")); |
| 134 } | 134 } |
| 135 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { | 135 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { |
| 136 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 136 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
| 137 } | 137 } |
| 138 // crbug.com/392768 | |
| 139 #if defined(OS_LINUX) | |
| 140 # define MAYBE_IrtManifestFile DISABLED_IrtManifestFile | |
| 141 #else | |
| 142 # define MAYBE_IrtManifestFile MAYBE_PNACL_NONSFI(IrtManifestFile) | |
| 143 #endif | |
| 144 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, | 138 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, |
| 145 MAYBE_IrtManifestFile) { | 139 MAYBE_PNACL_NONSFI(IrtManifestFile)) { |
| 146 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 140 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
| 147 } | 141 } |
| 148 | 142 |
| 149 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) { | 143 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) { |
| 150 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); | 144 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
| 151 } | 145 } |
| 152 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, | 146 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, |
| 153 MAYBE_PNACL_NONSFI(IrtException)) { | 147 MAYBE_PNACL_NONSFI(IrtException)) { |
| 154 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); | 148 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
| 155 } | 149 } |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 #define MAYBE_MimeHandler DISABLED_MimeHandler | 449 #define MAYBE_MimeHandler DISABLED_MimeHandler |
| 456 #else | 450 #else |
| 457 #define MAYBE_MimeHandler MimeHandler | 451 #define MAYBE_MimeHandler MimeHandler |
| 458 #endif | 452 #endif |
| 459 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) { | 453 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) { |
| 460 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 454 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 461 "ppapi_extension_mime_handler.html")); | 455 "ppapi_extension_mime_handler.html")); |
| 462 } | 456 } |
| 463 | 457 |
| 464 } // namespace | 458 } // namespace |
| OLD | NEW |