Commit c9aeec73 authored by W. James MacLean's avatar W. James MacLean Committed by Commit Bot

Disable more NaCl tests.

More tests that are flaking on Win7 32.

TBR=dschuff@chromium.org

Bug: 1059468
Change-Id: Iae2f5d10b0e2e36ef6487d7e20d34e626111993e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391171
Commit-Queue: James MacLean <wjmaclean@chromium.org>
Reviewed-by: default avatarJames MacLean <wjmaclean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803951}
parent a06e950f
...@@ -88,7 +88,13 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPIPPBInstance, { ...@@ -88,7 +88,13 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPIPPBInstance, {
RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_instance.html")); RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_instance.html"));
}) })
NACL_BROWSER_TEST_F(NaClBrowserTest, PPAPIPPPInstance, { // TODO(1059468): Flaky on Win7 (32).
#if defined(OS_WIN) && defined(ARCH_CPU_32_BITS)
#define MAYBE_PPAPIPPPInstance DISABLED_PPAPIPPPInstance
#else
#define MAYBE_PPAPIPPPInstance PPAPIPPPInstance
#endif
NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPIPPPInstance, {
RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppp_instance.html")); RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppp_instance.html"));
}) })
...@@ -468,11 +474,14 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, ...@@ -468,11 +474,14 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
"pnacl_dyncode_syscall_disabled.html")); "pnacl_dyncode_syscall_disabled.html"));
} }
// TODO(1059468): Flaky on Win7 (32).
#if !defined(OS_WIN) || !defined(ARCH_CPU_32_BITS)
IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
MAYBE_PNACL(PnaclExceptionHandlingDisabled)) { MAYBE_PNACL(PnaclExceptionHandlingDisabled)) {
RunNaClIntegrationTest(FILE_PATH_LITERAL( RunNaClIntegrationTest(FILE_PATH_LITERAL(
"pnacl_hw_eh_disabled.html")); "pnacl_hw_eh_disabled.html"));
} }
#endif
IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) { IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) {
RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment