| 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, | 139 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, |
| 140 MAYBE_GLIBC(PreInitManifestFile)) { | 140 MAYBE_GLIBC(PreInitManifestFile)) { |
| 141 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 141 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 142 "pm_pre_init_manifest_file_test.html")); | 142 "pm_pre_init_manifest_file_test.html")); |
| 143 } | 143 } |
| 144 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { | 144 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { |
| 145 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 145 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
| 146 } | 146 } |
| 147 // crbug.com/392768 |
| 148 #if defined(OS_LINUX) |
| 149 # define MAYBE_IrtManifestFile DISABLED_IrtManifestFile |
| 150 #else |
| 151 # define MAYBE_IrtManifestFile MAYBE_PNACL_NONSFI(IrtManifestFile) |
| 152 #endif |
| 147 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, | 153 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, |
| 148 MAYBE_PNACL_NONSFI(IrtManifestFile)) { | 154 MAYBE_IrtManifestFile) { |
| 149 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 155 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
| 150 } | 156 } |
| 151 | 157 |
| 152 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) { | 158 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) { |
| 153 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); | 159 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
| 154 } | 160 } |
| 155 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, | 161 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, |
| 156 MAYBE_PNACL_NONSFI(IrtException)) { | 162 MAYBE_PNACL_NONSFI(IrtException)) { |
| 157 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); | 163 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
| 158 } | 164 } |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 #define MAYBE_MimeHandler DISABLED_MimeHandler | 464 #define MAYBE_MimeHandler DISABLED_MimeHandler |
| 459 #else | 465 #else |
| 460 #define MAYBE_MimeHandler MimeHandler | 466 #define MAYBE_MimeHandler MimeHandler |
| 461 #endif | 467 #endif |
| 462 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) { | 468 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) { |
| 463 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 469 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 464 "ppapi_extension_mime_handler.html")); | 470 "ppapi_extension_mime_handler.html")); |
| 465 } | 471 } |
| 466 | 472 |
| 467 } // namespace | 473 } // namespace |
| OLD | NEW |