Revert "Enable the OpenGL renderer in some basic end2end tests."

Failures on Win 7/8 Debug NVIDIA bots. This reverts commit 1cb0a213. Change-Id: Ifb6b538e1b784a78c562a4d43d907bd0cdd59abf Reviewed-on: https://chromium-review.googlesource.com/263310Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Revert "Enable the OpenGL renderer in some basic end2end tests."
4b07348b · Geoff Lang · 1cb0a213 · 4b07348b · 4b07348b
Commit 4b07348b authored Mar 31, 2015 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

RendererTest.cpp src/tests/end2end_tests/RendererTest.cpp +2 -2

SimpleOperationTest.cpp src/tests/end2end_tests/SimpleOperationTest.cpp +1 -1

No files found.
--- a/src/tests/end2end_tests/RendererTest.cpp
+++ b/src/tests/end2end_tests/RendererTest.cpp
@@ -6,8 +6,8 @@
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-ANGLE_TYPED_TEST_CASE(RendererTest, ES2_D3D9,           ES2_D3D11,        ES2_D3D11_WARP,        ES2_D3D11_REFERENCE,        ES3_D3D11,        ES3_D3D11_WARP,        ES3_D3D11_REFERENCE,        ES2_OPENGL,
+ANGLE_TYPED_TEST_CASE(RendererTest, ES2_D3D9,           ES2_D3D11,        ES2_D3D11_WARP,        ES2_D3D11_REFERENCE,        ES3_D3D11,        ES3_D3D11_WARP,        ES3_D3D11_REFERENCE,
-                                    ES2_D3D9_REFERENCE, ES2_D3D11_FL11_0, ES2_D3D11_FL11_0_WARP, ES2_D3D11_FL11_0_REFERENCE, ES3_D3D11_FL11_0, ES3_D3D11_FL11_0_WARP, ES3_D3D11_FL11_0_REFERENCE, ES3_OPENGL,
+                                    ES2_D3D9_REFERENCE, ES2_D3D11_FL11_0, ES2_D3D11_FL11_0_WARP, ES2_D3D11_FL11_0_REFERENCE, ES3_D3D11_FL11_0, ES3_D3D11_FL11_0_WARP, ES3_D3D11_FL11_0_REFERENCE,
                                                        ES2_D3D11_FL10_1, ES2_D3D11_FL10_1_WARP, ES2_D3D11_FL10_1_REFERENCE, ES3_D3D11_FL10_1, ES3_D3D11_FL10_1_WARP, ES3_D3D11_FL10_1_REFERENCE,
                                                        ES2_D3D11_FL10_0, ES2_D3D11_FL10_0_WARP, ES2_D3D11_FL10_0_REFERENCE, ES3_D3D11_FL10_0, ES3_D3D11_FL10_0_WARP, ES3_D3D11_FL10_0_REFERENCE,
                                                        ES2_D3D11_FL9_3,  ES2_D3D11_FL9_3_WARP,  ES2_D3D11_FL9_3_REFERENCE);

--- a/src/tests/end2end_tests/SimpleOperationTest.cpp
+++ b/src/tests/end2end_tests/SimpleOperationTest.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-ANGLE_TYPED_TEST_CASE(SimpleOperationTest, ES2_D3D9, ES2_D3D11, ES3_D3D11, ES2_OPENGL, ES3_OPENGL);
+ANGLE_TYPED_TEST_CASE(SimpleOperationTest, ES2_D3D9, ES2_D3D11, ES3_D3D11);
 template<typename T>
 class SimpleOperationTest : public ANGLETest