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 "base/path_service.h" | 5 #include "base/path_service.h" |
6 #include "base/test/test_timeouts.h" | 6 #include "base/test/test_timeouts.h" |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
9 #include "chrome/browser/extensions/extension_browsertest.h" | 9 #include "chrome/browser/extensions/extension_browsertest.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 // Disable all NaCl tests for --disable-nacl flag and on Mac ASAN builds. | 59 // Disable all NaCl tests for --disable-nacl flag and on Mac ASAN builds. |
60 // Flaky on Mac ASAN: | 60 // Flaky on Mac ASAN: |
61 // http://crbug.com/428670 | 61 // http://crbug.com/428670 |
62 | 62 |
63 #if defined(DISABLE_NACL) || \ | 63 #if defined(DISABLE_NACL) || \ |
64 (defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)) || \ | 64 (defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)) || \ |
65 defined(DISABLE_NACL_BROWSERTESTS) | 65 defined(DISABLE_NACL_BROWSERTESTS) |
66 | 66 |
67 #define MAYBE_PPAPI_NACL(test_name) DISABLED_##test_name | 67 #define MAYBE_PPAPI_NACL(test_name) DISABLED_##test_name |
68 | 68 |
| 69 #define TEST_PPAPI_NACL_NATIVE(test_name) |
69 #define TEST_PPAPI_NACL(test_name) | 70 #define TEST_PPAPI_NACL(test_name) |
70 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) | 71 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) |
71 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) | 72 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) |
72 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) | 73 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) |
73 | 74 |
74 #else | 75 #else |
75 | 76 |
76 #define MAYBE_PPAPI_NACL(test_name) test_name | 77 #define MAYBE_PPAPI_NACL(test_name) test_name |
77 | 78 |
| 79 // NaCl based PPAPI tests (direct-to-native NaCl only, no PNaCl) |
| 80 #define TEST_PPAPI_NACL_NATIVE(test_name) \ |
| 81 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ |
| 82 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
| 83 } |
| 84 |
78 // NaCl based PPAPI tests | 85 // NaCl based PPAPI tests |
79 #define TEST_PPAPI_NACL(test_name) \ | 86 #define TEST_PPAPI_NACL(test_name) \ |
80 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ | 87 TEST_PPAPI_NACL_NATIVE(test_name) \ |
81 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | |
82 } \ | |
83 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ | 88 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ |
84 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 89 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
85 } \ | 90 } \ |
86 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \ | 91 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \ |
87 MAYBE_PNACL_NONSFI(test_name)) { \ | 92 MAYBE_PNACL_NONSFI(test_name)) { \ |
88 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 93 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
89 } | 94 } |
90 | 95 |
91 // NaCl based PPAPI tests | 96 // NaCl based PPAPI tests |
92 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) \ | 97 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) \ |
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator) | 538 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator) |
534 TEST_PPAPI_NACL(PaintAggregator) | 539 TEST_PPAPI_NACL(PaintAggregator) |
535 | 540 |
536 // TODO(danakj): http://crbug.com/115286 | 541 // TODO(danakj): http://crbug.com/115286 |
537 TEST_PPAPI_NACL(DISABLED_Scrollbar) | 542 TEST_PPAPI_NACL(DISABLED_Scrollbar) |
538 | 543 |
539 TEST_PPAPI_NACL(Var) | 544 TEST_PPAPI_NACL(Var) |
540 | 545 |
541 TEST_PPAPI_NACL(VarResource) | 546 TEST_PPAPI_NACL(VarResource) |
542 | 547 |
| 548 #if defined(__i386__) |
| 549 TEST_PPAPI_NACL_NATIVE(NaClIRTStackAlignment) |
| 550 #endif |
| 551 |
543 // PostMessage tests. | 552 // PostMessage tests. |
544 #define RUN_POSTMESSAGE_SUBTESTS \ | 553 #define RUN_POSTMESSAGE_SUBTESTS \ |
545 RunTestViaHTTP( \ | 554 RunTestViaHTTP( \ |
546 LIST_TEST(PostMessage_SendInInit) \ | 555 LIST_TEST(PostMessage_SendInInit) \ |
547 LIST_TEST(PostMessage_SendingData) \ | 556 LIST_TEST(PostMessage_SendingData) \ |
548 LIST_TEST(PostMessage_SendingString) \ | 557 LIST_TEST(PostMessage_SendingString) \ |
549 LIST_TEST(PostMessage_SendingArrayBuffer) \ | 558 LIST_TEST(PostMessage_SendingArrayBuffer) \ |
550 LIST_TEST(PostMessage_SendingArray) \ | 559 LIST_TEST(PostMessage_SendingArray) \ |
551 LIST_TEST(PostMessage_SendingDictionary) \ | 560 LIST_TEST(PostMessage_SendingDictionary) \ |
552 LIST_TEST(PostMessage_SendingResource) \ | 561 LIST_TEST(PostMessage_SendingResource) \ |
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1274 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1283 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
1275 RunTests("no_socket_permissions"); | 1284 RunTests("no_socket_permissions"); |
1276 } | 1285 } |
1277 | 1286 |
1278 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1287 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
1279 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1288 MAYBE_PPAPI_NACL(SocketPermissions)) { |
1280 RunTests("socket_permissions"); | 1289 RunTests("socket_permissions"); |
1281 } | 1290 } |
1282 | 1291 |
1283 #endif | 1292 #endif |
OLD | NEW |