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

diff --git a/src/tests/end2end_tests/LineLoopTest.cpp b/src/tests/end2end_tests/LineLoopTest.cpp
index e6c4a73..059169d 100644
--- a/src/tests/end2end_tests/LineLoopTest.cpp
+++ b/src/tests/end2end_tests/LineLoopTest.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(LineLoopTest, ES2_D3D9, ES2_D3D11);
+using namespace angle;
 
-template<typename T>
 class LineLoopTest : public ANGLETest
 {
-protected:
-    LineLoopTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetPlatform())
+  protected:
+    LineLoopTest()
     {
         setWindowWidth(256);
         setWindowHeight(256);
@@ -130,19 +134,19 @@
     GLint mColorLocation;
 };
 
-TYPED_TEST(LineLoopTest, LineLoopUByteIndices)
+TEST_P(LineLoopTest, LineLoopUByteIndices)
 {
     static const GLubyte indices[] = { 0, 7, 6, 9, 8, 0 };
     runTest(GL_UNSIGNED_BYTE, 0, indices + 1);
 }
 
-TYPED_TEST(LineLoopTest, LineLoopUShortIndices)
+TEST_P(LineLoopTest, LineLoopUShortIndices)
 {
     static const GLushort indices[] = { 0, 7, 6, 9, 8, 0 };
     runTest(GL_UNSIGNED_SHORT, 0, indices + 1);
 }
 
-TYPED_TEST(LineLoopTest, LineLoopUIntIndices)
+TEST_P(LineLoopTest, LineLoopUIntIndices)
 {
     if (!extensionEnabled("GL_OES_element_index_uint"))
     {
@@ -153,7 +157,7 @@
     runTest(GL_UNSIGNED_INT, 0, indices + 1);
 }
 
-TYPED_TEST(LineLoopTest, LineLoopUByteIndexBuffer)
+TEST_P(LineLoopTest, LineLoopUByteIndexBuffer)
 {
     static const GLubyte indices[] = { 0, 7, 6, 9, 8, 0 };
 
@@ -167,7 +171,7 @@
     glDeleteBuffers(1, &buf);
 }
 
-TYPED_TEST(LineLoopTest, LineLoopUShortIndexBuffer)
+TEST_P(LineLoopTest, LineLoopUShortIndexBuffer)
 {
     static const GLushort indices[] = { 0, 7, 6, 9, 8, 0 };
 
@@ -181,7 +185,7 @@
     glDeleteBuffers(1, &buf);
 }
 
-TYPED_TEST(LineLoopTest, LineLoopUIntIndexBuffer)
+TEST_P(LineLoopTest, LineLoopUIntIndexBuffer)
 {
     if (!extensionEnabled("GL_OES_element_index_uint"))
     {
@@ -199,3 +203,6 @@
 
     glDeleteBuffers(1, &buf);
 }
+
+// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
+ANGLE_INSTANTIATE_TEST(LineLoopTest, ES2_D3D9(), ES2_D3D11());