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

Unified Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 2464593002: Fix disabling of failing test from r428558. (Closed)
Patch Set: Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ppapi/ppapi_browsertest.cc
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index 367ecb0a3e8ac0ad436a371ec322ef0b5f6f53ee..90b370c90108a086c7901f36645d4b0829b287d1 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -1299,6 +1299,10 @@ class NonSfiPackagedAppTest : public PackagedAppTest {
// back.
IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
MAYBE_PPAPI_NACL(SuccessfulLoad)) {
+#if defined(OS_MACOSX)
+ if (base::mac::IsOS10_10() || base::mac::IsOS10_11())
+ return; // Fails when swarmed. http://crbug.com/660582
+#endif
RunTests("packaged_app");
}
@@ -1309,10 +1313,6 @@ IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
#define MAYBE_SuccessfulLoad MAYBE_PNACL_NONSFI(SuccessfulLoad)
#endif
IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, MAYBE_SuccessfulLoad) {
-#if defined(OS_MACOSX)
- if (base::mac::IsOS10_10() || base::mac::IsOS10_11())
- return; // Fails when swarmed. http://crbug.com/660582
-#endif
RunTests("packaged_app");
}
« 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