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>
diff --git a/src/tests/end2end_tests/BlendMinMaxTest.cpp b/src/tests/end2end_tests/BlendMinMaxTest.cpp
index e84f20b..daef5ba 100644
--- a/src/tests/end2end_tests/BlendMinMaxTest.cpp
+++ b/src/tests/end2end_tests/BlendMinMaxTest.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(BlendMinMaxTest, ES2_D3D9, ES2_D3D11, ES2_OPENGL);
+using namespace angle;
-template<typename T>
class BlendMinMaxTest : public ANGLETest
{
-protected:
- BlendMinMaxTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetPlatform())
+ protected:
+ BlendMinMaxTest()
{
setWindowWidth(128);
setWindowHeight(128);
@@ -146,13 +150,13 @@
GLuint mColorRenderbuffer;
};
-TYPED_TEST(BlendMinMaxTest, RGBA8)
+TEST_P(BlendMinMaxTest, RGBA8)
{
SetUpFramebuffer(GL_RGBA8);
runTest();
}
-TYPED_TEST(BlendMinMaxTest, RGBA32f)
+TEST_P(BlendMinMaxTest, RGBA32f)
{
if (getClientVersion() < 3 && !extensionEnabled("GL_OES_texture_float"))
{
@@ -164,7 +168,7 @@
runTest();
}
-TYPED_TEST(BlendMinMaxTest, RGBA16F)
+TEST_P(BlendMinMaxTest, RGBA16F)
{
if (getClientVersion() < 3 && !extensionEnabled("GL_OES_texture_half_float"))
{
@@ -175,3 +179,6 @@
SetUpFramebuffer(GL_RGBA16F);
runTest();
}
+
+// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
+ANGLE_INSTANTIATE_TEST(BlendMinMaxTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());