Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 2919703002: Disable flaky PPAPINaClPNaClTest.URLLoader1 test (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/test/test_timeouts.h" 9 #include "base/test/test_timeouts.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 #define TEST_PPAPI_NACL_NATIVE(test_name) 81 #define TEST_PPAPI_NACL_NATIVE(test_name)
82 #define TEST_PPAPI_NACL(test_name) 82 #define TEST_PPAPI_NACL(test_name)
83 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) 83 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name)
84 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) 84 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name)
85 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) 85 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement)
86 86
87 #else 87 #else
88 88
89 #define MAYBE_PPAPI_NACL(test_name) test_name 89 #define MAYBE_PPAPI_NACL(test_name) test_name
90 #if defined (OS_WIN) || defined(ADDRESS_SANITIZER) 90 #if defined(OS_WIN) || defined(OS_LINUX) || defined(ADDRESS_SANITIZER)
91 // http://crbug.com/633067 91 // http://crbug.com/633067, http://crbug.com/727989
92 #define MAYBE_PPAPI_PNACL(test_name) DISABLED_##test_name 92 #define MAYBE_PPAPI_PNACL(test_name) DISABLED_##test_name
93 #else 93 #else
94 #define MAYBE_PPAPI_PNACL(test_name) test_name 94 #define MAYBE_PPAPI_PNACL(test_name) test_name
95 #endif 95 #endif
96 96
97 // NaCl based PPAPI tests (direct-to-native NaCl only, no PNaCl) 97 // NaCl based PPAPI tests (direct-to-native NaCl only, no PNaCl)
98 #define TEST_PPAPI_NACL_NATIVE(test_name) \ 98 #define TEST_PPAPI_NACL_NATIVE(test_name) \
99 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ 99 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
100 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 100 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
101 } 101 }
(...skipping 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 MAYBE_PPAPI_NACL(NoSocketPermissions)) { 1343 MAYBE_PPAPI_NACL(NoSocketPermissions)) {
1344 RunTests("no_socket_permissions"); 1344 RunTests("no_socket_permissions");
1345 } 1345 }
1346 1346
1347 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, 1347 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1348 MAYBE_PPAPI_NACL(SocketPermissions)) { 1348 MAYBE_PPAPI_NACL(SocketPermissions)) {
1349 RunTests("socket_permissions"); 1349 RunTests("socket_permissions");
1350 } 1350 }
1351 1351
1352 #endif 1352 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698