dEQP: Fix non-GTest error logging.

Using the non-GTest dEQP targets led to crashes when deferencing a nullptr error logging method. Fix this by skipping platform init if there is a nullptr logError function. Bug: angleproject:2552 Change-Id: I161e35b49f7e9a7592cec968e3540a2e8b625f94 Reviewed-on: https://chromium-review.googlesource.com/1136663 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Luc Ferron <lucferron@chromium.org>

dEQP: Fix non-GTest error logging.
ecbaf666 · Jamie Madill · Commit Bot · e835609c · ecbaf666
Commit ecbaf666 authored Jul 13, 2018 by Jamie Madill Committed by Commit Bot Jul 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

tcuANGLEPlatform.cpp src/tests/deqp_support/tcuANGLEPlatform.cpp +7 -4

No files found.
--- a/src/tests/deqp_support/tcuANGLEPlatform.cpp
+++ b/src/tests/deqp_support/tcuANGLEPlatform.cpp
@@ -151,10 +151,13 @@ std::vector<eglw::EGLAttrib> ANGLEPlatform::initAttribs(eglw::EGLAttrib type,
        attribs.push_back(minorVersion);
    }
-    static_assert(sizeof(eglw::EGLAttrib) == sizeof(angle::PlatformMethods *),
+    if (mPlatformMethods.logError)
-                  "Unexpected pointer size");
+    {
-    attribs.push_back(EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX);
+        static_assert(sizeof(eglw::EGLAttrib) == sizeof(angle::PlatformMethods *),
-    attribs.push_back(reinterpret_cast<eglw::EGLAttrib>(&mPlatformMethods));
+                      "Unexpected pointer size");
+        attribs.push_back(EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX);
+        attribs.push_back(reinterpret_cast<eglw::EGLAttrib>(&mPlatformMethods));
+    }
    attribs.push_back(EGL_NONE);
    return attribs;