Commit e3516fff authored by jonross's avatar jonross Committed by Commit Bot

Re-enable SnapshotBrowserTest.AsyncMultiWindowTest on Linux

This change re-enables the SnapshotBrowserTest.AsyncMultiWindowTest on Linux.

While adding an early exit for variants running Vulkan. We currently lack a way
to mark gtests as expecting to fail for certain flag variants.

This will enable us to maintain coverage on Linux, while we separately
investigate the root cause on Vulkan.

TBR=kbr@chromium.org, jam@chromium.org

TEST: SnapshotBrowserTest.AsyncMultiWindowTest
Bug: 1003176, 1003375
Change-Id: I290f812546a9d1d02dceea40966b29f616562fc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1801053Reviewed-by: default avatarJonathan Ross <jonross@chromium.org>
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696055}
parent 79d0985d
......@@ -24,6 +24,7 @@
#include "content/public/test/content_browser_test_utils.h"
#include "content/shell/browser/shell.h"
#include "content/shell/common/shell_switches.h"
#include "gpu/command_buffer/service/gpu_switches.h"
#include "net/test/embedded_test_server/http_request.h"
#include "net/test/embedded_test_server/http_response.h"
#include "third_party/skia/include/core/SkBitmap.h"
......@@ -255,8 +256,7 @@ IN_PROC_BROWSER_TEST_F(SnapshotBrowserTest, SingleWindowTest) {
// Linux TSAN Tests
// Linux FYI SkiaRenderer Vulkan (Intel HD 630)
// See crbug.com/771119
#if (defined(OS_WIN) && !defined(NDEBUG)) || (defined(OS_CHROMEOS)) || \
defined(OS_LINUX)
#if (defined(OS_WIN) && !defined(NDEBUG)) || (defined(OS_CHROMEOS))
#define MAYBE_SyncMultiWindowTest DISABLED_SyncMultiWindowTest
#define MAYBE_AsyncMultiWindowTest DISABLED_AsyncMultiWindowTest
#else
......@@ -320,6 +320,13 @@ IN_PROC_BROWSER_TEST_F(SnapshotBrowserTest, MAYBE_SyncMultiWindowTest) {
}
IN_PROC_BROWSER_TEST_F(SnapshotBrowserTest, MAYBE_AsyncMultiWindowTest) {
// TODO(jonross): Re-enable this once the root cause of the failure has been
// fixed. https://crbug.com/1003375
const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kUseVulkan))
return;
SetupTestServer();
for (int i = 0; i < 3; ++i) {
......
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