Commit 0750b6d8 authored by Brian Sheedy's avatar Brian Sheedy Committed by Chromium LUCI CQ

Increase GPU collection timeout on Mac Debug

Increases the timeout for GPU info collection on Mac Debug builds, as
tests are flakily hitting the 5 second default timeout.

Bug: 1153667
Change-Id: Ica5608d53d6c65a9a0af9c6ec69829346a348b8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566695
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832155}
parent 7bc2a82c
...@@ -46,9 +46,11 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoSize( ...@@ -46,9 +46,11 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoSize(
.Build(); .Build();
} }
// Give the GPU process a few seconds to provide GPU info. // Give the GPU process a few seconds to provide GPU info.
// Linux Debug builds need more time -- see Issue 796437 and 1046598. // Linux and Mac Debug builds need more time -- see Issue 796437, 1046598, and
// 1153667.
// Windows builds need more time -- see Issue 873112 and 1004472. // Windows builds need more time -- see Issue 873112 and 1004472.
#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(NDEBUG)) || \ #if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)) && \
!defined(NDEBUG)) || \
defined(OS_WIN) defined(OS_WIN)
const int kGPUInfoWatchdogTimeoutMs = 30000; const int kGPUInfoWatchdogTimeoutMs = 30000;
#else #else
......
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