| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 #if !defined(__arm__) | 73 #if !defined(__arm__) |
| 74 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, BadNative) { | 74 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, BadNative) { |
| 75 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_bad_native.html")); | 75 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_bad_native.html")); |
| 76 } | 76 } |
| 77 #endif | 77 #endif |
| 78 | 78 |
| 79 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_Crash, { | 79 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_Crash, { |
| 80 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html")); | 80 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html")); |
| 81 }) | 81 }) |
| 82 | 82 |
| 83 // PNaCl version does not work. |
| 84 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, ManifestFile) { |
| 85 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_manifest_file_test.html")); |
| 86 } |
| 87 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, ManifestFile) { |
| 88 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_manifest_file_test.html")); |
| 89 } |
| 90 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, PreInitManifestFile) { |
| 91 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 92 "pm_pre_init_manifest_file_test.html")); |
| 93 } |
| 94 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) { |
| 95 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 96 "pm_pre_init_manifest_file_test.html")); |
| 97 } |
| 98 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { |
| 99 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
| 100 } |
| 101 |
| 83 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, { | 102 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, { |
| 84 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html")); | 103 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html")); |
| 85 }) | 104 }) |
| 86 | 105 |
| 87 // Some versions of Visual Studio does not like preprocessor | 106 // Some versions of Visual Studio does not like preprocessor |
| 88 // conditionals inside the argument of a macro, so we put the | 107 // conditionals inside the argument of a macro, so we put the |
| 89 // conditionals on a helper function. We are already in an anonymous | 108 // conditionals on a helper function. We are already in an anonymous |
| 90 // namespace, so the name of the helper is not visible in external | 109 // namespace, so the name of the helper is not visible in external |
| 91 // scope. | 110 // scope. |
| 92 #if defined(OS_POSIX) | 111 #if defined(OS_POSIX) |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 270 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 252 "pm_redir_test.html?stream=stderr&thread=fg&delay_us=1000000")); | 271 "pm_redir_test.html?stream=stderr&thread=fg&delay_us=1000000")); |
| 253 } | 272 } |
| 254 | 273 |
| 255 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) { | 274 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) { |
| 256 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 275 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 257 "pm_redir_test.html?stream=stderr&thread=bg&delay_us=1000000")); | 276 "pm_redir_test.html?stream=stderr&thread=bg&delay_us=1000000")); |
| 258 } | 277 } |
| 259 | 278 |
| 260 } // namespace | 279 } // namespace |
| OLD | NEW |