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

diff --git a/tests/angle_tests/TextureTest.cpp b/tests/angle_tests/TextureTest.cpp
index 6323d8d..1213972 100644
--- a/tests/angle_tests/TextureTest.cpp
+++ b/tests/angle_tests/TextureTest.cpp
@@ -1,9 +1,14 @@
 #include "ANGLETest.h"
 
+// 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(TextureTest, TestFixtureTypes);
+
+template<typename T>
 class TextureTest : public ANGLETest
 {
 protected:
-    TextureTest()
+    TextureTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetRequestedRenderer())
     {
         setWindowWidth(128);
         setWindowHeight(128);
@@ -96,7 +101,7 @@
     GLint mTexture2DUniformLocation;
 };
 
-TEST_F(TextureTest, NegativeAPISubImage)
+TYPED_TEST(TextureTest, NegativeAPISubImage)
 {
     glBindTexture(GL_TEXTURE_2D, mTexture2D);
     EXPECT_GL_ERROR(GL_NO_ERROR);
@@ -106,7 +111,7 @@
     EXPECT_GL_ERROR(GL_INVALID_VALUE);
 }
 
-TEST_F(TextureTest, ZeroSizedUploads)
+TYPED_TEST(TextureTest, ZeroSizedUploads)
 {
     glBindTexture(GL_TEXTURE_2D, mTexture2D);
     EXPECT_GL_ERROR(GL_NO_ERROR);
@@ -129,7 +134,7 @@
 }
 
 // Test drawing with two texture types, to trigger an ANGLE bug in validation
-TEST_F(TextureTest, CubeMapBug)
+TYPED_TEST(TextureTest, CubeMapBug)
 {
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, mTexture2D);