Temporarily move back ANGLETest in end2end_tests

This path needs to a Chrome change before it can change.

BUG=angleproject:892

Change-Id: I549737383b9720a2e7d83ee5e3145d71716f04cb
Reviewed-on: https://chromium-review.googlesource.com/270457
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

src/tests/angle_end2end_tests.gypi

@@ -49,8 +49,8 @@
             '<(angle_path)/src/tests/gl_tests/UnpackRowLength.cpp',
             '<(angle_path)/src/tests/gl_tests/VertexAttributeTest.cpp',
             '<(angle_path)/src/tests/gl_tests/ViewportTest.cpp',
-            '<(angle_path)/src/tests/test_utils/ANGLETest.cpp',
-            '<(angle_path)/src/tests/test_utils/ANGLETest.h',
+            '<(angle_path)/src/tests/end2end_tests/ANGLETest.cpp',
+            '<(angle_path)/src/tests/end2end_tests/ANGLETest.h',
             '<(angle_path)/src/tests/test_utils/angle_test_configs.h',
         ],
         'angle_end2end_tests_win_sources':

src/tests/angle_end2end_tests_main.cpp

@@ -5,7 +5,7 @@
 //
 
 #include "gtest/gtest.h"
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 int main(int argc, char** argv)
 {

src/tests/end2end_tests/ANGLETest.h

@@ -11,7 +11,7 @@
 #include <algorithm>
 
 #include "angle_gl.h"
-#include "angle_test_configs.h"
+#include "test_utils/angle_test_configs.h"
 #include "common/angleutils.h"
 #include "shader_utils.h"
 

src/tests/gl_tests/BlendMinMaxTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/BlitFramebufferANGLETest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/BufferDataTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 #include <cstdint>
 

src/tests/gl_tests/ClearTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/CompressedTextureTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 #include "media/pixel.inl"
 

src/tests/gl_tests/CubeMapTextureTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/DepthStencilFormatsTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/DrawBuffersTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/FenceSyncTests.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/FramebufferFormatsTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/FramebufferRenderMipmapTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/GLSLTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 #include "libANGLE/Context.h"
 #include "libANGLE/Program.h"

src/tests/gl_tests/IncompleteTextureTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 #include <vector>
 

src/tests/gl_tests/IndexedPointsTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 #include <array>
 

src/tests/gl_tests/InstancingTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/LineLoopTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/MaxTextureSizeTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/MipmapTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/OcclusionQueriesTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 // Needed for Sleep()
 #include <Windows.h>

src/tests/gl_tests/PBOExtensionTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/PbufferTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/PointSpritesTest.cpp

@@ -6,7 +6,7 @@
 // Some of the pointsprite tests below were ported from Khronos WebGL
 // conformance test suite.
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/ProgramBinaryTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 #include <memory>
 #include <stdint.h>

src/tests/gl_tests/QueryDisplayAttribTest.cpp

@@ -12,7 +12,7 @@
 #define ANGLE_ENABLE_D3D11
 #endif
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 #include "com_utils.h"
 
 using namespace angle;

src/tests/gl_tests/ReadPixelsTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/RendererTest.cpp

@@ -8,7 +8,7 @@
 //   If one of these tests fails, then it is likely that some of the other tests are being configured incorrectly.
 //   For example, they might be using the D3D11 renderer when the test is meant to be using the D3D9 renderer.
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/SRGBTextureTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/SimpleOperationTest.cpp

@@ -6,7 +6,7 @@
 // SimpleOperationTest:
 //   Basic GL commands such as linking a program, initializing a buffer, etc.
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 #include <vector>
 

src/tests/gl_tests/SwizzleTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 #include <vector>
 

src/tests/gl_tests/TextureTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/TransformFeedbackTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/UniformBufferTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/UniformTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/UnpackAlignmentTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 #include <array>
 

src/tests/gl_tests/UnpackRowLength.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 #include <array>
 

src/tests/gl_tests/VertexAttributeTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;
 

src/tests/gl_tests/ViewportTest.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-#include "test_utils/ANGLETest.h"
+#include "end2end_tests/ANGLETest.h"
 
 using namespace angle;