commit 18b931d5e05e86301df508c6b400938e4a4d6a4b
author Austin Kinross <aukinros@microsoft.com> Mon Sep 29 12:58:31 2014 -0700
committer Geoff Lang <geofflang@chromium.org> Tue Sep 30 21:51:38 2014 +0000
tree a019a22af7dee7574516e2a45892201c8bc2cabc
parent 3269bcb4978bd9bd0c0547d832f85856f57c84e3

Configure Google Tests to run against multiple renderers/GLES versions

BUG=angle:611

Change-Id: I7d43612171c439045038db9ae82fd8716c0b31c6
Reviewed-on: https://chromium-review.googlesource.com/220400
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Austin Kinross <aukinros@microsoft.com>

tests/angle_tests/CompressedTextureTest.cpp

diff --git a/tests/angle_tests/CompressedTextureTest.cpp b/tests/angle_tests/CompressedTextureTest.cpp
index 7d95907..9b07e6c 100644
--- a/tests/angle_tests/CompressedTextureTest.cpp
+++ b/tests/angle_tests/CompressedTextureTest.cpp
@@ -1,10 +1,15 @@
 #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.
+typedef ::testing::Types<TFT<Gles::Two, Rend::D3D11>, TFT<Gles::Two, Rend::D3D9>> TestFixtureTypes;
+TYPED_TEST_CASE(CompressedTextureTest, TestFixtureTypes);
+
+template<typename T>
 class CompressedTextureTest : public ANGLETest
 {
 protected:
-    CompressedTextureTest()
+    CompressedTextureTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetRequestedRenderer())
     {
         setWindowWidth(512);
         setWindowHeight(512);
@@ -66,7 +71,7 @@
     GLint mTextureUniformLocation;
 };
 
-TEST_F(CompressedTextureTest, CompressedTexImage)
+TYPED_TEST(CompressedTextureTest, CompressedTexImage)
 {
     if (getClientVersion() < 3 && !extensionEnabled("GL_EXT_texture_compression_dxt1"))
     {
@@ -106,7 +111,7 @@
     EXPECT_GL_NO_ERROR();
 }
 
-TEST_F(CompressedTextureTest, CompressedTexStorage)
+TYPED_TEST(CompressedTextureTest, CompressedTexStorage)
 {
     if (getClientVersion() < 3 && !extensionEnabled("GL_EXT_texture_compression_dxt1"))
     {