summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl
diff options
context:
space:
mode:
authorJohn Abd-El-Malek <jam@chromium.org>2014-09-20 17:56:18 -0700
committerJohn Abd-El-Malek <jam@chromium.org>2014-09-21 00:57:11 +0000
commit7800f4b115ac5b77ff03d4d3e88af6327f6a0d95 (patch)
tree6e34b06a510d61a8e0bd1ee67403105728a16e75 /chrome/test/nacl
parent3c157d3a6fca397d031ee2ae41abc740a9e9a8bc (diff)
downloadchromium_src-7800f4b115ac5b77ff03d4d3e88af6327f6a0d95.zip
chromium_src-7800f4b115ac5b77ff03d4d3e88af6327f6a0d95.tar.gz
chromium_src-7800f4b115ac5b77ff03d4d3e88af6327f6a0d95.tar.bz2
Disable NaClBrowserTestNewlib.IrtException on Windows to see if that gets rid of the hung browser test binaries.
BUG=416272 TBR=uekawa@chromium.org Review URL: https://codereview.chromium.org/591883002 Cr-Commit-Position: refs/heads/master@{#295898}
Diffstat (limited to 'chrome/test/nacl')
-rw-r--r--chrome/test/nacl/nacl_browsertest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
index 58014e2..db9ccfe 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -122,7 +122,13 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
}
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) {
+#if defined(OS_WIN)
+// http://crbug.com/416272
+#define MAYBE_IrtException DISABLED_IrtException
+#else
+#define MAYBE_IrtException IrtException
+#endif
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) {
RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
}
IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,