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/PbufferTest.cpp b/src/tests/end2end_tests/PbufferTest.cpp
index ba5c747..69c7fda 100644
--- a/src/tests/end2end_tests/PbufferTest.cpp
+++ b/src/tests/end2end_tests/PbufferTest.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(PbufferTest, ES2_D3D9, ES2_D3D11, ES2_OPENGL, ES2_D3D11_WARP, ES2_D3D11_REFERENCE);
+using namespace angle;
-template<typename T>
class PbufferTest : public ANGLETest
{
protected:
- PbufferTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetPlatform())
+ PbufferTest()
{
setWindowWidth(512);
setWindowHeight(512);
@@ -109,7 +113,7 @@
};
// Test clearing a Pbuffer and checking the color is correct
-TYPED_TEST(PbufferTest, Clearing)
+TEST_P(PbufferTest, Clearing)
{
if (!mSupportsPbuffers)
{
@@ -145,7 +149,7 @@
}
// Bind the Pbuffer to a texture and verify it renders correctly
-TYPED_TEST(PbufferTest, BindTexImage)
+TEST_P(PbufferTest, BindTexImage)
{
if (!mSupportsPbuffers)
{
@@ -208,7 +212,7 @@
// Verify that when eglBind/ReleaseTexImage are called, the texture images are freed and their
// size information is correctly updated.
-TYPED_TEST(PbufferTest, TextureSizeReset)
+TEST_P(PbufferTest, TextureSizeReset)
{
if (!mSupportsPbuffers)
{
@@ -261,3 +265,6 @@
drawQuad(mTextureProgram, "position", 0.5f);
EXPECT_PIXEL_EQ(0, 0, 0, 0, 0, 255);
}
+
+// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
+ANGLE_INSTANTIATE_TEST(PbufferTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_D3D11_WARP(), ES2_D3D11_REFERENCE());