diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/headless/lib/headless_browser_browsertest.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/headless/lib/headless_browser_browsertest.cc')
| -rw-r--r-- | chromium/headless/lib/headless_browser_browsertest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/headless/lib/headless_browser_browsertest.cc b/chromium/headless/lib/headless_browser_browsertest.cc index 277b7201a27..9dc68729e5b 100644 --- a/chromium/headless/lib/headless_browser_browsertest.cc +++ b/chromium/headless/lib/headless_browser_browsertest.cc @@ -212,8 +212,9 @@ class HeadlessBrowserTestWithProxy : public HeadlessBrowserTest { net::SpawnedTestServer proxy_server_; }; -#if defined(OS_WIN) +#if defined(OS_WIN) || (defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)) // TODO(crbug.com/1045971): Disabled due to flakiness. +// TODO(crbug.com/1086872): Disabled due to flakiness on Mac ASAN. #define MAYBE_SetProxyConfig DISABLED_SetProxyConfig #else #define MAYBE_SetProxyConfig SetProxyConfig |