Supress failing end2end tests with Metal validation layer

The 3 tests run failed with Metal validation layer, which block end2end tests run with validation layer in CQ. Suppress temporarily while we're fixing.

BUG=dawn:139

Change-Id: I0b6c99ac731b90cd10b8b1f7bb5d3f5e1976fb07
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/8241
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Li, Hao 2019-06-25 00:49:56 +00:00 committed by Commit Bot service account
parent 99b76d1b8f
commit 6fa398e682
4 changed files with 23 additions and 0 deletions

View File

@ -190,6 +190,10 @@ bool DawnTestEnvironment::UsesWire() const {
return mUseWire;
}
bool DawnTestEnvironment::IsBackendValidationEnabled() const {
return mEnableBackendValidation;
}
dawn_native::Instance* DawnTestEnvironment::GetInstance() const {
return mInstance.get();
}
@ -296,6 +300,10 @@ bool DawnTest::UsesWire() const {
return gTestEnv->UsesWire();
}
bool DawnTest::IsBackendValidationEnabled() const {
return gTestEnv->IsBackendValidationEnabled();
}
void DawnTest::SetUp() {
// Get an adapter for the backend to use, and create the device.
dawn_native::Adapter backendAdapter;

View File

@ -109,6 +109,7 @@ class DawnTestEnvironment : public testing::Environment {
void SetUp() override;
bool UsesWire() const;
bool IsBackendValidationEnabled() const;
dawn_native::Instance* GetInstance() const;
GLFWwindow* GetWindowForBackend(dawn_native::BackendType type) const;
@ -151,6 +152,7 @@ class DawnTest : public ::testing::TestWithParam<DawnTestParam> {
bool IsMacOS() const;
bool UsesWire() const;
bool IsBackendValidationEnabled() const;
void StartExpectDeviceError();
bool EndExpectDeviceError();

View File

@ -112,6 +112,10 @@ void ComputeIndirectTests::BasicTest(std::initializer_list<uint32_t> bufferList,
TEST_P(ComputeIndirectTests, Basic) {
// See https://bugs.chromium.org/p/dawn/issues/detail?id=159
DAWN_SKIP_TEST_IF(IsD3D12() && IsNvidia());
// TODO(hao.x.li@intel.com): Test failing on Metal with validation layer on, which blocks
// end2end tests run with validation layer in bots. Suppress this while we're fixing.
// See https://bugs.chromium.org/p/dawn/issues/detail?id=139
DAWN_SKIP_TEST_IF(IsMetal() && IsBackendValidationEnabled());
BasicTest({2, 3, 4}, 0);
}
@ -120,6 +124,10 @@ TEST_P(ComputeIndirectTests, Basic) {
TEST_P(ComputeIndirectTests, IndirectOffset) {
// See https://bugs.chromium.org/p/dawn/issues/detail?id=159
DAWN_SKIP_TEST_IF(IsD3D12() && IsNvidia());
// TODO(hao.x.li@intel.com): Test failing on Metal with validation layer on, which blocks
// end2end tests run with validation layer in bots. Suppress this while we're fixing.
// See https://bugs.chromium.org/p/dawn/issues/detail?id=139
DAWN_SKIP_TEST_IF(IsMetal() && IsBackendValidationEnabled());
BasicTest({0, 0, 0, 2, 3, 4}, 3 * sizeof(uint32_t));
}

View File

@ -258,6 +258,11 @@ TEST_P(MultisampledRenderingTest, ResolveInto2DTexture) {
// Test multisampled rendering with depth test works correctly.
TEST_P(MultisampledRenderingTest, MultisampledRenderingWithDepthTest) {
// TODO(hao.x.li@intel.com): Test failing on Metal with validation layer on, which blocks
// end2end tests run with validation layer in bots. Suppress this while we're fixing.
// See https://bugs.chromium.org/p/dawn/issues/detail?id=139
DAWN_SKIP_TEST_IF(IsMetal() && IsBackendValidationEnabled());
constexpr bool kTestDepth = true;
dawn::CommandEncoder commandEncoder = device.CreateCommandEncoder();
dawn::RenderPipeline pipeline = CreateRenderPipelineWithOneOutputForTest(kTestDepth);