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

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

Issue 2788633003: Disable NewlibPackagedAppTest.SuccessfulLoad (Closed)
Patch Set: Fix disable Created 3 years, 8 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 "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after
1296 NonSfiPackagedAppTest() : PackagedAppTest("nonsfi") { } 1296 NonSfiPackagedAppTest() : PackagedAppTest("nonsfi") { }
1297 1297
1298 void SetUpCommandLine(base::CommandLine* command_line) override { 1298 void SetUpCommandLine(base::CommandLine* command_line) override {
1299 PackagedAppTest::SetUpCommandLine(command_line); 1299 PackagedAppTest::SetUpCommandLine(command_line);
1300 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); 1300 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
1301 } 1301 }
1302 }; 1302 };
1303 1303
1304 // Load a packaged app, and wait for it to successfully post a "hello" message 1304 // Load a packaged app, and wait for it to successfully post a "hello" message
1305 // back. 1305 // back.
1306 #if defined(OS_WIN)
1307 // flaky: crbug.com/707068
1308 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, DISABLED_SuccessfulLoad) {
1309 #else
1306 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, 1310 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1307 MAYBE_PPAPI_NACL(SuccessfulLoad)) { 1311 MAYBE_PPAPI_NACL(SuccessfulLoad)) {
1312 #endif
1308 RunTests("packaged_app"); 1313 RunTests("packaged_app");
1309 } 1314 }
1310 1315
1311 #if defined(OS_LINUX) 1316 #if defined(OS_LINUX)
1312 // http://crbug.com/579804 1317 // http://crbug.com/579804
1313 #define MAYBE_SuccessfulLoad DISABLED_SuccessfulLoad 1318 #define MAYBE_SuccessfulLoad DISABLED_SuccessfulLoad
1314 #else 1319 #else
1315 #define MAYBE_SuccessfulLoad MAYBE_PNACL_NONSFI(SuccessfulLoad) 1320 #define MAYBE_SuccessfulLoad MAYBE_PNACL_NONSFI(SuccessfulLoad)
1316 #endif 1321 #endif
1317 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, MAYBE_SuccessfulLoad) { 1322 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, MAYBE_SuccessfulLoad) {
1318 RunTests("packaged_app"); 1323 RunTests("packaged_app");
1319 } 1324 }
1320 1325
1321 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, 1326 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1322 MAYBE_PPAPI_NACL(MulticastPermissions)) { 1327 MAYBE_PPAPI_NACL(MulticastPermissions)) {
1323 RunTests("multicast_permissions"); 1328 RunTests("multicast_permissions");
1324 } 1329 }
1325 1330
1326 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, 1331 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1327 MAYBE_PPAPI_NACL(NoSocketPermissions)) { 1332 MAYBE_PPAPI_NACL(NoSocketPermissions)) {
1328 RunTests("no_socket_permissions"); 1333 RunTests("no_socket_permissions");
1329 } 1334 }
1330 1335
1331 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, 1336 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1332 MAYBE_PPAPI_NACL(SocketPermissions)) { 1337 MAYBE_PPAPI_NACL(SocketPermissions)) {
1333 RunTests("socket_permissions"); 1338 RunTests("socket_permissions");
1334 } 1339 }
1335 1340
1336 #endif 1341 #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