Commit ff7a58a4 authored by Elly Fong-Jones's avatar Elly Fong-Jones Committed by Commit Bot

mac: disable one HangWatchScopeEnabledBlockingTest on Mac-Arm64

It flakily hangs, which is being investigated but is not a blocker since
the hang watcher isn't shipped on Mac currently.

Bug: 1140207
Change-Id: I47ab3bfc8770c85b0b3de608295ade53a43e7669
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2486078Reviewed-by: default avatarOliver Li <olivierli@chromium.org>
Reviewed-by: default avatarJan Wilken Dörrie <jdoerrie@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819386}
parent ba982e82
......@@ -23,6 +23,7 @@
#include "base/threading/thread_checker.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
......@@ -900,9 +901,19 @@ TEST_F(HangWatchScopeEnabledBlockingTest, ScopeBlocksDuringCapture) {
VerifyScopesDontBlock();
}
#if defined(OS_MAC) && defined(ARCH_CPU_ARM64)
// Flaky hangs on arm64 Macs: https://crbug.com/1140207
#define MAYBE_NewScopeDoesNotBlockDuringCapture \
DISABLED_NewScopeDoesNotBlockDuringCapture
#else
#define MAYBE_NewScopeDoesNotBlockDuringCapture \
NewScopeDoesNotBlockDuringCapture
#endif
// Test that execution does not block in ~HangWatchScopeEnabled() when the scope
// was created after the start of a capture.
TEST_F(HangWatchScopeEnabledBlockingTest, NewScopeDoesNotBlockDuringCapture) {
TEST_F(HangWatchScopeEnabledBlockingTest,
MAYBE_NewScopeDoesNotBlockDuringCapture) {
// Start a HangWatchScopeEnabled that expires right away. Ensures that the
// first monitor will detect a hang.
HangWatchScopeEnabled expires_right_away(base::TimeDelta{});
......
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