Commit eaff2d86 authored by Joe Downing's avatar Joe Downing Committed by Commit Bot

Disabling flaky NaClBrowserTestPnacl tests

TBR: mseaborn@chromium.org
Bug: 1046044
Change-Id: I65fef5989be8ee468d67bee7c48887ed56af6e85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2023228Reviewed-by: default avatarJoe Downing <joedow@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735520}
parent 3a677235
......@@ -396,15 +396,27 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclSubzero, MAYBE_PnaclErrorHandling) {
RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html"));
}
#if defined(OS_WIN)
// TODO(crbug.com/1046044) Test is flaky on Win 7.
#define MAYBE_PnaclNMFOptionsO0 DISABLED_PnaclNMFOptionsO0
#else
#define MAYBE_PnaclNMFOptionsO0 PnaclNMFOptionsO0
#endif
IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
MAYBE_PNACL(PnaclNMFOptionsO0)) {
MAYBE_PNACL(MAYBE_PnaclNMFOptionsO0)) {
RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0"));
}
// Test Subzero. Subzero is triggered by the O0 option so reuse
// test harnesses that use "optlevel": 0.
#if defined(OS_WIN)
// TODO(crbug.com/1046044) Test is flaky on Win 7.
#define MAYBE_SubZeroPnaclNMFOptionsO0 DISABLED_SubZeroPnaclNMFOptionsO0
#else
#define MAYBE_SubZeroPnaclNMFOptionsO0 PnaclNMFOptionsO0
#endif
IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclSubzero,
MAYBE_PNACL(PnaclNMFOptionsO0)) {
MAYBE_PNACL(MAYBE_SubZeroPnaclNMFOptionsO0)) {
RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0"));
}
......
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