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/CompressedTextureTest.cpp b/src/tests/end2end_tests/CompressedTextureTest.cpp
index 18125a0..7fecf38 100644
--- a/src/tests/end2end_tests/CompressedTextureTest.cpp
+++ b/src/tests/end2end_tests/CompressedTextureTest.cpp
@@ -1,14 +1,19 @@
+//
+// 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"
+
#include "media/pixel.inl"
-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-ANGLE_TYPED_TEST_CASE(CompressedTextureTest, ES2_D3D9, ES2_D3D11, ES2_D3D11_FL9_3, ES2_OPENGL, ES3_OPENGL);
+using namespace angle;
-template<typename T>
class CompressedTextureTest : public ANGLETest
{
-protected:
- CompressedTextureTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetPlatform())
+ protected:
+ CompressedTextureTest()
{
setWindowWidth(512);
setWindowHeight(512);
@@ -70,7 +75,7 @@
GLint mTextureUniformLocation;
};
-TYPED_TEST(CompressedTextureTest, CompressedTexImage)
+TEST_P(CompressedTextureTest, CompressedTexImage)
{
if (!extensionEnabled("GL_EXT_texture_compression_dxt1"))
{
@@ -111,7 +116,7 @@
EXPECT_GL_NO_ERROR();
}
-TYPED_TEST(CompressedTextureTest, CompressedTexStorage)
+TEST_P(CompressedTextureTest, CompressedTexStorage)
{
if (!extensionEnabled("GL_EXT_texture_compression_dxt1"))
{
@@ -168,18 +173,11 @@
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_TYPED_TEST_CASE(CompressedTextureTestES3, ES3_D3D11);
+class CompressedTextureTestES3 : public CompressedTextureTest { };
-template<typename T>
-class CompressedTextureTestES3 : public CompressedTextureTest<T> { };
+class CompressedTextureTestD3D11 : public CompressedTextureTest { };
-ANGLE_TYPED_TEST_CASE(CompressedTextureTestD3D11, ES2_D3D11, ES3_D3D11, ES2_D3D11_FL9_3);
-
-template<typename T>
-class CompressedTextureTestD3D11 : public CompressedTextureTest<T> { };
-
-TYPED_TEST(CompressedTextureTestES3, PBOCompressedTexImage)
+TEST_P(CompressedTextureTestES3, PBOCompressedTexImage)
{
GLuint texture;
glGenTextures(1, &texture);
@@ -232,7 +230,7 @@
}
-TYPED_TEST(CompressedTextureTestD3D11, PBOCompressedTexStorage)
+TEST_P(CompressedTextureTestD3D11, PBOCompressedTexStorage)
{
if (getClientVersion() < 3 && !extensionEnabled("GL_EXT_texture_compression_dxt1"))
{
@@ -302,3 +300,13 @@
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(
+ CompressedTextureTest,
+ ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3(), ES2_OPENGL(), ES3_OPENGL());
+
+// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
+ANGLE_INSTANTIATE_TEST(CompressedTextureTestES3, ES3_D3D11());
+
+ANGLE_INSTANTIATE_TEST(CompressedTextureTestD3D11, ES2_D3D11(), ES3_D3D11(), ES2_D3D11_FL9_3());