Skip to content

Commit

Permalink
[Sheriff] Disable failing test on all mac bots, not just debug and arm.
Browse files Browse the repository at this point in the history
It is failing consistently on Mac 10.12 bots.

(cherry picked from commit d12b59d)

Bug: chromium:1222886
Change-Id: I2228f030d6d90f4bc67385c555f6d8622730c8e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3479916
Owners-Override: Titouan Rigoudy <titouan@google.com>
Reviewed-by: Antonio Sartori <antoniosartori@chromium.org>
Commit-Queue: Titouan Rigoudy <titouan@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#973696}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3542747
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Mason Freed <masonf@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/branch-heads/4896@{#790}
Cr-Branched-From: 1f63ff4-refs/heads/main@{#972766}
  • Loading branch information
letitz authored and Chromium LUCI CQ committed Mar 22, 2022
1 parent b3fa597 commit cd089ab
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions chrome/test/data/webui/settings/cr_settings_browsertest.js
Expand Up @@ -608,10 +608,9 @@ TEST_F('CrSettingsAdvancedPageTest', 'MAYBE_Load', function() {
['ZoomLevels', 'zoom_levels_tests.js'],
].forEach(test => registerTest(...test));

// Timeout on Linux and MacOS dbg bots: https://crbug.com/1133412
// Fails on Mac/Arm: https://crbug.com/1222886
GEN('#if (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC)) || ' +
'(defined(NDEBUG) && !defined(ARCH_CPU_ARM64))');
// Timeout on Linux dbg bots: https://crbug.com/1133412
// Fails on Mac bots: https://crbug.com/1222886
GEN('#if !((BUILDFLAG(IS_LINUX) && !defined(NDEBUG)) || BUILDFLAG(IS_MAC))');
[['SecurityPage', 'security_page_test.js'],
].forEach(test => registerTest(...test));
GEN('#endif');
Expand Down

0 comments on commit cd089ab

Please sign in to comment.