commit fa05f6076ee3d0372f29e1a1381de035b964be4f
author Jamie Madill <jmadill@chromium.org> Thu May 07 13:47:11 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Fri May 08 19:12:52 2015 +0000
tree 00b076cdc298d8c64883bb2f3988bd091c2558ea
parent 0ca53786c6a5166acc545edadbd8597f59350c04

Use value-paramaterized tests instead of by type.

This should fix our non-standard template use, which causes compile
errors for the tests on GCC/Clang.

BUG=angleproject:997

Change-Id: Id1bb15231eda445f37e53a5b33d4684ec6618d8e
Reviewed-on: https://chromium-review.googlesource.com/269858
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/tests/end2end_tests/FramebufferRenderMipmapTest.cpp

diff --git a/src/tests/end2end_tests/FramebufferRenderMipmapTest.cpp b/src/tests/end2end_tests/FramebufferRenderMipmapTest.cpp
index 9227b0c..aa463c5 100644
--- a/src/tests/end2end_tests/FramebufferRenderMipmapTest.cpp
+++ b/src/tests/end2end_tests/FramebufferRenderMipmapTest.cpp
@@ -1,13 +1,17 @@
+//
+// Copyright 2015 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
 #include "ANGLETest.h"
 
-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-ANGLE_TYPED_TEST_CASE(FramebufferRenderMipmapTest, ES2_D3D9, ES2_D3D11, ES3_D3D11, ES2_OPENGL, ES3_OPENGL);
+using namespace angle;
 
-template<typename T>
 class FramebufferRenderMipmapTest : public ANGLETest
 {
-protected:
-    FramebufferRenderMipmapTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetPlatform())
+  protected:
+    FramebufferRenderMipmapTest()
     {
         setWindowWidth(256);
         setWindowHeight(256);
@@ -72,7 +76,7 @@
 
 // Validate that if we are in ES3 or GL_OES_fbo_render_mipmap exists, there are no validation errors
 // when using a non-zero level in glFramebufferTexture2D.
-TYPED_TEST(FramebufferRenderMipmapTest, Validation)
+TEST_P(FramebufferRenderMipmapTest, Validation)
 {
     bool renderToMipmapSupported = extensionEnabled("GL_OES_fbo_render_mipmap") || getClientVersion() > 2;
 
@@ -114,7 +118,7 @@
 }
 
 // Render to various levels of a texture and check that they have the correct color data via ReadPixels
-TYPED_TEST(FramebufferRenderMipmapTest, RenderToMipmap)
+TEST_P(FramebufferRenderMipmapTest, RenderToMipmap)
 {
     // TODO(geofflang): Figure out why this is broken on Intel OpenGL
     if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
@@ -186,3 +190,6 @@
 
     EXPECT_GL_NO_ERROR();
 }
+
+// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
+ANGLE_INSTANTIATE_TEST(FramebufferRenderMipmapTest, ES2_D3D9(), ES2_D3D11(), ES3_D3D11(), ES2_OPENGL(), ES3_OPENGL());