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

Unified Diff: chrome/test/nacl/nacl_browsertest.cc

Issue 1647773004: Disable NonSfi tests failing on linux bots (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/nacl/nacl_browsertest.cc
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
index 79537dabc83748f861d9c7e672005dedd48a1df9..784165ca96151c51a9cafc4c9707b68c8aba6621 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -152,8 +152,13 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashPPAPIOffMainThread, {
IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) {
RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
}
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
- MAYBE_PNACL_NONSFI(IrtManifestFile)) {
+#if defined(OS_LINUX)
+// http://crbug.com/579804
+#define MAYBE_IrtManifestFile DISABLED_IrtManifestFile
+#else
+#define MAYBE_IrtManifestFile MAYBE_PNACL_NONSFI(IrtManifestFile)
+#endif
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, MAYBE_IrtManifestFile) {
RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
}
@@ -166,8 +171,13 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) {
RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
}
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
- MAYBE_PNACL_NONSFI(IrtException)) {
+#if defined(OS_LINUX)
+// http://crbug.com/579804
+#define MAYBE_IrtException2 DISABLED_IrtException
+#else
+#define MAYBE_IrtException2 MAYBE_PNACL_NONSFI(IrtException)
+#endif
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, MAYBE_IrtException2) {
RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
}
« no previous file with comments | « no previous file | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698