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

diff --git a/tests/angle_tests/IncompleteTextureTest.cpp b/tests/angle_tests/IncompleteTextureTest.cpp
index eea64f2..a2508a0 100644
--- a/tests/angle_tests/IncompleteTextureTest.cpp
+++ b/tests/angle_tests/IncompleteTextureTest.cpp
@@ -2,10 +2,15 @@
 
 #include <vector>
 
+// 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(IncompleteTextureTest, TestFixtureTypes);
+
+template<typename T>
 class IncompleteTextureTest : public ANGLETest
 {
 protected:
-    IncompleteTextureTest()
+    IncompleteTextureTest() : ANGLETest(T::GetGlesMajorVersion(), T::GetRequestedRenderer())
     {
         setWindowWidth(128);
         setWindowHeight(128);
@@ -76,7 +81,7 @@
     GLint mTextureUniformLocation;
 };
 
-TEST_F(IncompleteTextureTest, IncompleteTexture2D)
+TYPED_TEST(IncompleteTextureTest, IncompleteTexture2D)
 {
     GLuint tex;
     glGenTextures(1, &tex);
@@ -110,7 +115,7 @@
     glDeleteTextures(1, &tex);
 }
 
-TEST_F(IncompleteTextureTest, UpdateTexture)
+TYPED_TEST(IncompleteTextureTest, UpdateTexture)
 {
     GLuint tex;
     glGenTextures(1, &tex);