| 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 19 matching lines...) Expand all Loading... |
| 30 // crbug.com/98721 | 30 // crbug.com/98721 |
| 31 # define MAYBE_SysconfNprocessorsOnln DISABLED_SysconfNprocessorsOnln | 31 # define MAYBE_SysconfNprocessorsOnln DISABLED_SysconfNprocessorsOnln |
| 32 #else | 32 #else |
| 33 # define MAYBE_SysconfNprocessorsOnln SysconfNprocessorsOnln | 33 # define MAYBE_SysconfNprocessorsOnln SysconfNprocessorsOnln |
| 34 #endif | 34 #endif |
| 35 | 35 |
| 36 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, { | 36 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, { |
| 37 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); | 37 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); |
| 38 }) | 38 }) |
| 39 | 39 |
| 40 // ASan does not work with libc-free context, so disable the test. | 40 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Messaging)) { |
| 41 #if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER) | |
| 42 # define MAYBE_NonSfiMessaging NonSfiMessaging | |
| 43 #else | |
| 44 # define MAYBE_NonSfiMessaging DISABLED_NonSfiMessaging | |
| 45 #endif | |
| 46 | |
| 47 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NonSfiMessaging) { | |
| 48 RunLoadTest(FILE_PATH_LITERAL("libc_free.html")); | 41 RunLoadTest(FILE_PATH_LITERAL("libc_free.html")); |
| 49 } | 42 } |
| 50 | 43 |
| 51 // ASan does not work with libc-free context, so disable the test. | 44 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) { |
| 52 #if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER) | |
| 53 # define MAYBE_NonSfiIrt NonSfiIrt | |
| 54 #else | |
| 55 # define MAYBE_NonSfiIrt DISABLED_NonSfiIrt | |
| 56 #endif | |
| 57 | |
| 58 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NonSfiIrt) { | |
| 59 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html")); | 45 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html")); |
| 60 } | 46 } |
| 61 | 47 |
| 62 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, { | 48 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, { |
| 63 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 49 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 64 "pm_exit_status_test.html?trigger=exit0&expected_exit=0")); | 50 "pm_exit_status_test.html?trigger=exit0&expected_exit=0")); |
| 65 }) | 51 }) |
| 66 | 52 |
| 67 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus254, { | 53 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus254, { |
| 68 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 54 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 122 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 137 "pm_pre_init_manifest_file_test.html")); | 123 "pm_pre_init_manifest_file_test.html")); |
| 138 } | 124 } |
| 139 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) { | 125 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) { |
| 140 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 126 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 141 "pm_pre_init_manifest_file_test.html")); | 127 "pm_pre_init_manifest_file_test.html")); |
| 142 } | 128 } |
| 143 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { | 129 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { |
| 144 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 130 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
| 145 } | 131 } |
| 132 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, |
| 133 MAYBE_PNACL_NONSFI(IrtManifestFile)) { |
| 134 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
| 135 } |
| 146 | 136 |
| 147 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, { | 137 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, { |
| 148 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html")); | 138 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html")); |
| 149 }) | 139 }) |
| 150 | 140 |
| 151 // Some versions of Visual Studio does not like preprocessor | 141 // Some versions of Visual Studio does not like preprocessor |
| 152 // conditionals inside the argument of a macro, so we put the | 142 // conditionals inside the argument of a macro, so we put the |
| 153 // conditionals on a helper function. We are already in an anonymous | 143 // conditionals on a helper function. We are already in an anonymous |
| 154 // namespace, so the name of the helper is not visible in external | 144 // namespace, so the name of the helper is not visible in external |
| 155 // scope. | 145 // scope. |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 } | 445 } |
| 456 }; | 446 }; |
| 457 | 447 |
| 458 // TODO(ncbray) support glibc and PNaCl | 448 // TODO(ncbray) support glibc and PNaCl |
| 459 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { | 449 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { |
| 460 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 450 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 461 "ppapi_extension_mime_handler.html")); | 451 "ppapi_extension_mime_handler.html")); |
| 462 } | 452 } |
| 463 | 453 |
| 464 } // namespace | 454 } // namespace |
| OLD | NEW |