MultiviewRenderTest: Return if test should be skipped
MultiviewFramebufferTestBase::FramebufferTestSetUp() may not complete if
ANGLETestBase::ANGLETestSetUp() determines the test needs to be skipped
due to (for example) missing extension support. In that case, there may
not be a current Context, leading to calls like glGetString() returning
nullptr.
Check if the test is marked "Skipped" before continuing in
MultiviewRenderTest::SetUp().
Bug: b/279980674
Change-Id: Iba869029bc26fc5528853be0323fd3c50037a493
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6631023
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com>
diff --git a/src/tests/gl_tests/MultiviewDrawTest.cpp b/src/tests/gl_tests/MultiviewDrawTest.cpp
index 2db0733..83452f9 100644
--- a/src/tests/gl_tests/MultiviewDrawTest.cpp
+++ b/src/tests/gl_tests/MultiviewDrawTest.cpp
@@ -298,6 +298,12 @@
void SetUp() override
{
MultiviewFramebufferTestBase::FramebufferTestSetUp();
+ // SetUp() may have determined the test should be skipped and returned before completing.
+ if (Test::IsSkipped())
+ {
+ return;
+ }
+
testSetUp();
}
void TearDown() override
