summaryrefslogtreecommitdiffstats
path: root/chrome/test/ppapi
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-06-30 14:53:26 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-30 21:53:47 +0000
commit40d4d9c6d54392e9aefa3734941d3268961e32c1 (patch)
tree16bfe4ad4d5226d6f650c490050749215b6c4617 /chrome/test/ppapi
parentfc0f5bc2af413fab0ced7fa4053fbadbc226b837 (diff)
downloadchromium_src-40d4d9c6d54392e9aefa3734941d3268961e32c1.zip
chromium_src-40d4d9c6d54392e9aefa3734941d3268961e32c1.tar.gz
chromium_src-40d4d9c6d54392e9aefa3734941d3268961e32c1.tar.bz2
Disable PPAPINaClPNaClTest.TCPSocket
It's crashy on the mac asan bot. BUG=428670 R=bbudge@chromium.org TBR=bbudge@chromium.org Review URL: https://codereview.chromium.org/1222433002 Cr-Commit-Position: refs/heads/master@{#336883}
Diffstat (limited to 'chrome/test/ppapi')
-rw-r--r--chrome/test/ppapi/ppapi_browsertest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index fa2de45..5c70828 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -283,9 +283,16 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, TCPSocket) {
IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, TCPSocket) {
RUN_TCPSOCKET_SUBTESTS;
}
-IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) {
+#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
+// Flaky on Mac ASAN: http://crbug.com/437411.
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, DISABLED_TCPSocket) {
+ RUN_TCPSOCKET_SUBTESTS;
+}
+#else
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, DISABLED_TCPSocket) {
RUN_TCPSOCKET_SUBTESTS;
}
+#endif
IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
MAYBE_PNACL_NONSFI(TCPSocket)) {
RUN_TCPSOCKET_SUBTESTS;