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/ReadPixelsTest.cpp

diff --git a/src/tests/end2end_tests/ReadPixelsTest.cpp b/src/tests/end2end_tests/ReadPixelsTest.cpp
index d54081c..901a46c 100644
--- a/src/tests/end2end_tests/ReadPixelsTest.cpp
+++ b/src/tests/end2end_tests/ReadPixelsTest.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(ReadPixelsTest, ES3_D3D11);
+using namespace angle;
 
-template<typename T>
 class ReadPixelsTest : public ANGLETest
 {
-protected:
-    ReadPixelsTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetPlatform())
+  protected:
+    ReadPixelsTest()
     {
         setWindowWidth(32);
         setWindowHeight(32);
@@ -87,7 +91,7 @@
     GLuint mPositionVBO;
 };
 
-TYPED_TEST(ReadPixelsTest, OutOfBounds)
+TEST_P(ReadPixelsTest, OutOfBounds)
 {
     glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
@@ -120,7 +124,7 @@
     }
 }
 
-TYPED_TEST(ReadPixelsTest, PBOWithOtherTarget)
+TEST_P(ReadPixelsTest, PBOWithOtherTarget)
 {
     glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
@@ -145,7 +149,7 @@
     EXPECT_GL_NO_ERROR();
 }
 
-TYPED_TEST(ReadPixelsTest, PBOWithExistingData)
+TEST_P(ReadPixelsTest, PBOWithExistingData)
 {
     // Clear backbuffer to red
     glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
@@ -183,7 +187,7 @@
     EXPECT_GL_NO_ERROR();
 }
 
-TYPED_TEST(ReadPixelsTest, PBOAndSubData)
+TEST_P(ReadPixelsTest, PBOAndSubData)
 {
     glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
@@ -211,7 +215,7 @@
     EXPECT_GL_NO_ERROR();
 }
 
-TYPED_TEST(ReadPixelsTest, PBOAndSubDataOffset)
+TEST_P(ReadPixelsTest, PBOAndSubDataOffset)
 {
     glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
@@ -244,7 +248,7 @@
     EXPECT_GL_NO_ERROR();
 }
 
-TYPED_TEST(ReadPixelsTest, DrawWithPBO)
+TEST_P(ReadPixelsTest, DrawWithPBO)
 {
     unsigned char data[4] = { 1, 2, 3, 4 };
 
@@ -297,7 +301,7 @@
     EXPECT_EQ(4, data[3]);
 }
 
-TYPED_TEST(ReadPixelsTest, MultisampledPBO)
+TEST_P(ReadPixelsTest, MultisampledPBO)
 {
     if (getClientVersion() < 3 && !extensionEnabled("GL_ANGLE_framebuffer_multisample"))
     {
@@ -340,3 +344,6 @@
     glDeleteRenderbuffers(1, &rbo);
     glDeleteFramebuffers(1, &fbo);
 }
+
+// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
+ANGLE_INSTANTIATE_TEST(ReadPixelsTest, ES3_D3D11());