Commit a6f84dd7 authored by Alan Screen's avatar Alan Screen Committed by Chromium LUCI CQ

[Sheriff] Disable GPU tests on Linux

Bug: 1162117
Change-Id: I1c5b8f9379150a17b2f35b2681dc2149b2759dec
TBR: jdarpinian
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2605403
Commit-Queue: James Darpinian <jdarpinian@chromium.org>
Auto-Submit: Alan Screen <awscreen@chromium.org>
Reviewed-by: default avatarJames Darpinian <jdarpinian@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839502}
parent 11297512
...@@ -2,11 +2,19 @@ ...@@ -2,11 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "build/build_config.h"
#include "gpu/command_buffer/client/webgpu_implementation.h" #include "gpu/command_buffer/client/webgpu_implementation.h"
#include "gpu/command_buffer/tests/webgpu_test.h" #include "gpu/command_buffer/tests/webgpu_test.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
// TODO(crbug.com/1162117): gl_tests failing on Linux
#if defined(OS_LINUX)
#define MAYBE(test_name) DISABLED_##test_name
#else
#define MAYBE(test_name) test_name
#endif
namespace { namespace {
class MockFenceOnCompletionCallback { class MockFenceOnCompletionCallback {
...@@ -48,7 +56,7 @@ class WebGPUFenceTest : public WebGPUTest { ...@@ -48,7 +56,7 @@ class WebGPUFenceTest : public WebGPUTest {
}; };
// Test that getting the value of the fence is the initial value. // Test that getting the value of the fence is the initial value.
TEST_F(WebGPUFenceTest, InitialValue) { TEST_F(WebGPUFenceTest, MAYBE(InitialValue)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped"; LOG(ERROR) << "Test skipped";
return; return;
...@@ -71,7 +79,7 @@ TEST_F(WebGPUFenceTest, InitialValue) { ...@@ -71,7 +79,7 @@ TEST_F(WebGPUFenceTest, InitialValue) {
} }
// Test that after signaling a fence, its completed value gets updated. // Test that after signaling a fence, its completed value gets updated.
TEST_F(WebGPUFenceTest, GetCompletedValue) { TEST_F(WebGPUFenceTest, MAYBE(GetCompletedValue)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped"; LOG(ERROR) << "Test skipped";
return; return;
...@@ -90,7 +98,7 @@ TEST_F(WebGPUFenceTest, GetCompletedValue) { ...@@ -90,7 +98,7 @@ TEST_F(WebGPUFenceTest, GetCompletedValue) {
// Test that a fence's OnCompletion handler is called after the signal value // Test that a fence's OnCompletion handler is called after the signal value
// is completed. // is completed.
TEST_F(WebGPUFenceTest, OnCompletion) { TEST_F(WebGPUFenceTest, MAYBE(OnCompletion)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped"; LOG(ERROR) << "Test skipped";
return; return;
...@@ -112,7 +120,7 @@ TEST_F(WebGPUFenceTest, OnCompletion) { ...@@ -112,7 +120,7 @@ TEST_F(WebGPUFenceTest, OnCompletion) {
} }
// Test signaling a fence a million times. // Test signaling a fence a million times.
TEST_F(WebGPUFenceTest, SignalManyTimes) { TEST_F(WebGPUFenceTest, MAYBE(SignalManyTimes)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped"; LOG(ERROR) << "Test skipped";
return; return;
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "build/build_config.h"
#include "components/viz/test/test_gpu_service_holder.h" #include "components/viz/test/test_gpu_service_holder.h"
#include "gpu/command_buffer/client/shared_image_interface.h" #include "gpu/command_buffer/client/shared_image_interface.h"
#include "gpu/command_buffer/client/webgpu_implementation.h" #include "gpu/command_buffer/client/webgpu_implementation.h"
...@@ -13,6 +14,13 @@ ...@@ -13,6 +14,13 @@
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/color_space.h" #include "ui/gfx/color_space.h"
// TODO(crbug.com/1162117): gl_tests failing on Linux
#if defined(OS_LINUX)
#define MAYBE(test_name) DISABLED_##test_name
#else
#define MAYBE(test_name) test_name
#endif
namespace gpu { namespace gpu {
namespace { namespace {
...@@ -88,7 +96,7 @@ class WebGPUMailboxTest : public WebGPUTest { ...@@ -88,7 +96,7 @@ class WebGPUMailboxTest : public WebGPUTest {
} }
}; };
TEST_F(WebGPUMailboxTest, AssociateMailboxCmd) { TEST_F(WebGPUMailboxTest, MAYBE(AssociateMailboxCmd)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
...@@ -206,7 +214,7 @@ TEST_F(WebGPUMailboxTest, AssociateMailboxCmd) { ...@@ -206,7 +214,7 @@ TEST_F(WebGPUMailboxTest, AssociateMailboxCmd) {
GetGpuServiceHolder()->gpu_thread_task_runner()->RunsTasksInCurrentSequence(); GetGpuServiceHolder()->gpu_thread_task_runner()->RunsTasksInCurrentSequence();
} }
TEST_F(WebGPUMailboxTest, DissociateMailboxCmd) { TEST_F(WebGPUMailboxTest, MAYBE(DissociateMailboxCmd)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
...@@ -274,7 +282,7 @@ TEST_F(WebGPUMailboxTest, DissociateMailboxCmd) { ...@@ -274,7 +282,7 @@ TEST_F(WebGPUMailboxTest, DissociateMailboxCmd) {
// For simplicity of the test the image is shared between a Dawn device and // For simplicity of the test the image is shared between a Dawn device and
// itself: we render to it using the Dawn device, then re-associate it to a // itself: we render to it using the Dawn device, then re-associate it to a
// Dawn texture and read back the values that were written. // Dawn texture and read back the values that were written.
TEST_F(WebGPUMailboxTest, WriteToMailboxThenReadFromIt) { TEST_F(WebGPUMailboxTest, MAYBE(WriteToMailboxThenReadFromIt)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
...@@ -386,7 +394,7 @@ TEST_F(WebGPUMailboxTest, WriteToMailboxThenReadFromIt) { ...@@ -386,7 +394,7 @@ TEST_F(WebGPUMailboxTest, WriteToMailboxThenReadFromIt) {
} }
// Tests that using a shared image aftr it is dissociated produces an error. // Tests that using a shared image aftr it is dissociated produces an error.
TEST_F(WebGPUMailboxTest, ErrorWhenUsingTextureAfterDissociate) { TEST_F(WebGPUMailboxTest, MAYBE(ErrorWhenUsingTextureAfterDissociate)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
...@@ -448,7 +456,7 @@ TEST_F(WebGPUMailboxTest, ErrorWhenUsingTextureAfterDissociate) { ...@@ -448,7 +456,7 @@ TEST_F(WebGPUMailboxTest, ErrorWhenUsingTextureAfterDissociate) {
// the move-assignment operator to be called. In this case the defaulted // the move-assignment operator to be called. In this case the defaulted
// move-assignment would first move `representation` then `access`. Causing // move-assignment would first move `representation` then `access`. Causing
// incorrect member destruction order for the move-to object. // incorrect member destruction order for the move-to object.
TEST_F(WebGPUMailboxTest, UseA_UseB_DestroyA_DestroyB) { TEST_F(WebGPUMailboxTest, MAYBE(UseA_UseB_DestroyA_DestroyB)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
...@@ -501,7 +509,7 @@ TEST_F(WebGPUMailboxTest, UseA_UseB_DestroyA_DestroyB) { ...@@ -501,7 +509,7 @@ TEST_F(WebGPUMailboxTest, UseA_UseB_DestroyA_DestroyB) {
// images was stored globally instead of per-device. This meant that of two // images was stored globally instead of per-device. This meant that of two
// devices tried to create shared images with the same (id, generation) (which // devices tried to create shared images with the same (id, generation) (which
// is possible because they can be on different Dawn wires) they would conflict. // is possible because they can be on different Dawn wires) they would conflict.
TEST_F(WebGPUMailboxTest, AssociateOnTwoDevicesAtTheSameTime) { TEST_F(WebGPUMailboxTest, MAYBE(AssociateOnTwoDevicesAtTheSameTime)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
......
...@@ -19,6 +19,13 @@ ...@@ -19,6 +19,13 @@
#include "gpu/ipc/webgpu_in_process_context.h" #include "gpu/ipc/webgpu_in_process_context.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
// TODO(crbug.com/1162117): gl_tests failing on Linux
#if defined(OS_LINUX)
#define MAYBE(test_name) DISABLED_##test_name
#else
#define MAYBE(test_name) test_name
#endif
namespace gpu { namespace gpu {
namespace { namespace {
...@@ -174,7 +181,7 @@ WebGPUTest::DeviceAndClientID WebGPUTest::GetNewDeviceAndClientID() { ...@@ -174,7 +181,7 @@ WebGPUTest::DeviceAndClientID WebGPUTest::GetNewDeviceAndClientID() {
return result; return result;
} }
TEST_F(WebGPUTest, FlushNoCommands) { TEST_F(WebGPUTest, MAYBE(FlushNoCommands)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
...@@ -186,7 +193,7 @@ TEST_F(WebGPUTest, FlushNoCommands) { ...@@ -186,7 +193,7 @@ TEST_F(WebGPUTest, FlushNoCommands) {
} }
// Referred from GLES2ImplementationTest/ReportLoss // Referred from GLES2ImplementationTest/ReportLoss
TEST_F(WebGPUTest, ReportLoss) { TEST_F(WebGPUTest, MAYBE(ReportLoss)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
...@@ -206,7 +213,7 @@ TEST_F(WebGPUTest, ReportLoss) { ...@@ -206,7 +213,7 @@ TEST_F(WebGPUTest, ReportLoss) {
} }
// Referred from GLES2ImplementationTest/ReportLossReentrant // Referred from GLES2ImplementationTest/ReportLossReentrant
TEST_F(WebGPUTest, ReportLossReentrant) { TEST_F(WebGPUTest, MAYBE(ReportLossReentrant)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
...@@ -225,7 +232,7 @@ TEST_F(WebGPUTest, ReportLossReentrant) { ...@@ -225,7 +232,7 @@ TEST_F(WebGPUTest, ReportLossReentrant) {
EXPECT_EQ(0, lost_count); EXPECT_EQ(0, lost_count);
} }
TEST_F(WebGPUTest, RequestAdapterAfterContextLost) { TEST_F(WebGPUTest, MAYBE(RequestAdapterAfterContextLost)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
...@@ -239,7 +246,7 @@ TEST_F(WebGPUTest, RequestAdapterAfterContextLost) { ...@@ -239,7 +246,7 @@ TEST_F(WebGPUTest, RequestAdapterAfterContextLost) {
base::BindOnce(&OnRequestAdapterCallback))); base::BindOnce(&OnRequestAdapterCallback)));
} }
TEST_F(WebGPUTest, RequestDeviceAfterContextLost) { TEST_F(WebGPUTest, MAYBE(RequestDeviceAfterContextLost)) {
if (!WebGPUSupported()) { if (!WebGPUSupported()) {
LOG(ERROR) << "Test skipped because WebGPU isn't supported"; LOG(ERROR) << "Test skipped because WebGPU isn't supported";
return; return;
......
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