blob: 755f30ed7957c6df6aa42b90a99fc7cb29acd376 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
--- base/threading/scoped_blocking_call_unittest.cc.orig 2020-11-13 06:36:34 UTC
+++ base/threading/scoped_blocking_call_unittest.cc
@@ -273,7 +273,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA
}
TEST_F(ScopedBlockingCallIOJankMonitoringTest, OverlappingMultipleWindows) {
- constexpr auto kJankTiming =
+ auto kJankTiming =
internal::IOJankMonitoringWindow::kMonitoringWindow * 3 +
internal::IOJankMonitoringWindow::kIOJankInterval * 5;
@@ -530,7 +530,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh
// First one starting at 10 seconds (can't start later than that or we'll trip
// the kTimeDiscrepancyTimeout per TaskEnvironment's inability to RunUntilIdle()
// with pending blocked tasks).
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
// https://crbug.com/1071166
#define MAYBE_MultiThreadedOverlappedWindows \
DISABLED_MultiThreadedOverlappedWindows
|
