Move end2end and standalone tests to gl_tests and egl_tests

src/tests/angle_end2end_tests.gypi

@@ -14,50 +14,50 @@
         # This file list will be shared with the GN build.
         'angle_end2end_tests_sources':
         [
-            '<(angle_path)/src/tests/end2end_tests/ANGLETest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/ANGLETest.h',
-            '<(angle_path)/src/tests/end2end_tests/BlendMinMaxTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/BlitFramebufferANGLETest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/BufferDataTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/ClearTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/CompressedTextureTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/CubeMapTextureTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/DepthStencilFormatsTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/DrawBuffersTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/FenceSyncTests.cpp',
-            '<(angle_path)/src/tests/end2end_tests/FramebufferFormatsTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/FramebufferRenderMipmapTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/GLSLTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/IncompleteTextureTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/IndexedPointsTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/InstancingTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/LineLoopTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/MaxTextureSizeTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/MipmapTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/media/pixel.inl',
-            '<(angle_path)/src/tests/end2end_tests/OcclusionQueriesTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/PBOExtensionTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/PbufferTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/PointSpritesTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/ProgramBinaryTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/QueryDisplayAttribTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/ReadPixelsTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/RendererTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/SimpleOperationTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/SRGBTextureTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/SwizzleTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/TextureTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/TransformFeedbackTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/UniformBufferTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/UniformTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/UnpackAlignmentTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/UnpackRowLength.cpp',
-            '<(angle_path)/src/tests/end2end_tests/VertexAttributeTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/ViewportTest.cpp',
-            '<(angle_path)/src/tests/end2end_tests/angle_test_configs.h',
-            '<(angle_path)/src/tests/standalone_tests/EGLQueryContextTest.cpp',
-            '<(angle_path)/src/tests/standalone_tests/EGLSurfaceTest.cpp',
-            '<(angle_path)/src/tests/standalone_tests/EGLThreadTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/BlendMinMaxTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/BlitFramebufferANGLETest.cpp',
+            '<(angle_path)/src/tests/gl_tests/BufferDataTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/ClearTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/CompressedTextureTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/CubeMapTextureTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/DepthStencilFormatsTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/DrawBuffersTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/FenceSyncTests.cpp',
+            '<(angle_path)/src/tests/gl_tests/FramebufferFormatsTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/GLSLTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/IncompleteTextureTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/IndexedPointsTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/InstancingTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/LineLoopTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/MaxTextureSizeTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/MipmapTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/media/pixel.inl',
+            '<(angle_path)/src/tests/gl_tests/OcclusionQueriesTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/PBOExtensionTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/PbufferTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/PointSpritesTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/ProgramBinaryTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/QueryDisplayAttribTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/ReadPixelsTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/RendererTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/SimpleOperationTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/SRGBTextureTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/SwizzleTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/TextureTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/TransformFeedbackTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/UniformBufferTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/UniformTest.cpp',
+            '<(angle_path)/src/tests/gl_tests/UnpackAlignmentTest.cpp',
+            '<(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/egl_tests/EGLQueryContextTest.cpp',
+            '<(angle_path)/src/tests/egl_tests/EGLSurfaceTest.cpp',
+            '<(angle_path)/src/tests/egl_tests/EGLThreadTest.cpp',
+            '<(angle_path)/src/tests/test_utils/ANGLETest.cpp',
+            '<(angle_path)/src/tests/test_utils/ANGLETest.h',
+            '<(angle_path)/src/tests/test_utils/angle_test_configs.h',
         ],
     },
     'dependencies':
@@ -71,7 +71,7 @@
     'include_dirs':
     [
         '<(angle_path)/include',
-        'end2end_tests',
+        '<(angle_path)/src/tests'
     ],
     'sources':
     [

src/tests/angle_end2end_tests_main.cpp

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

src/tests/standalone_tests/EGLSurfaceTest.cpp → src/tests/egl_tests/EGLSurfaceTest.cpp

@@ -7,7 +7,7 @@
 //   Tests pertaining to egl::Surface.
 //
 
-#include <ANGLETest.h>
+#include <test_utils/ANGLETest.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <GLES2/gl2.h>

src/tests/end2end_tests/BlendMinMaxTest.cpp → src/tests/gl_tests/BlendMinMaxTest.cpp

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

src/tests/end2end_tests/BlitFramebufferANGLETest.cpp → src/tests/gl_tests/BlitFramebufferANGLETest.cpp

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

src/tests/end2end_tests/BufferDataTest.cpp → src/tests/gl_tests/BufferDataTest.cpp

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

src/tests/end2end_tests/ClearTest.cpp → src/tests/gl_tests/ClearTest.cpp

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

src/tests/end2end_tests/CompressedTextureTest.cpp → src/tests/gl_tests/CompressedTextureTest.cpp

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

src/tests/end2end_tests/CubeMapTextureTest.cpp → src/tests/gl_tests/CubeMapTextureTest.cpp

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

src/tests/end2end_tests/DepthStencilFormatsTest.cpp → src/tests/gl_tests/DepthStencilFormatsTest.cpp

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

src/tests/end2end_tests/DrawBuffersTest.cpp → src/tests/gl_tests/DrawBuffersTest.cpp

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

src/tests/end2end_tests/FenceSyncTests.cpp → src/tests/gl_tests/FenceSyncTests.cpp

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

src/tests/end2end_tests/FramebufferFormatsTest.cpp → src/tests/gl_tests/FramebufferFormatsTest.cpp

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

src/tests/end2end_tests/FramebufferRenderMipmapTest.cpp → src/tests/gl_tests/FramebufferRenderMipmapTest.cpp

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

src/tests/end2end_tests/GLSLTest.cpp → src/tests/gl_tests/GLSLTest.cpp

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

src/tests/end2end_tests/IncompleteTextureTest.cpp → src/tests/gl_tests/IncompleteTextureTest.cpp

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

src/tests/end2end_tests/IndexedPointsTest.cpp → src/tests/gl_tests/IndexedPointsTest.cpp

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

src/tests/end2end_tests/InstancingTest.cpp → src/tests/gl_tests/InstancingTest.cpp

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

src/tests/end2end_tests/LineLoopTest.cpp → src/tests/gl_tests/LineLoopTest.cpp

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

src/tests/end2end_tests/MaxTextureSizeTest.cpp → src/tests/gl_tests/MaxTextureSizeTest.cpp

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

src/tests/end2end_tests/MipmapTest.cpp → src/tests/gl_tests/MipmapTest.cpp

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

src/tests/end2end_tests/OcclusionQueriesTest.cpp → src/tests/gl_tests/OcclusionQueriesTest.cpp

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

src/tests/end2end_tests/PBOExtensionTest.cpp → src/tests/gl_tests/PBOExtensionTest.cpp

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

src/tests/end2end_tests/PbufferTest.cpp → src/tests/gl_tests/PbufferTest.cpp

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

src/tests/end2end_tests/PointSpritesTest.cpp → 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 "ANGLETest.h"
+#include "test_utils/ANGLETest.h"
 
 using namespace angle;
 

src/tests/end2end_tests/ProgramBinaryTest.cpp → src/tests/gl_tests/ProgramBinaryTest.cpp

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

src/tests/end2end_tests/QueryDisplayAttribTest.cpp → src/tests/gl_tests/QueryDisplayAttribTest.cpp

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

src/tests/end2end_tests/ReadPixelsTest.cpp → src/tests/gl_tests/ReadPixelsTest.cpp

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

src/tests/end2end_tests/RendererTest.cpp → 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 "ANGLETest.h"
+#include "test_utils/ANGLETest.h"
 
 using namespace angle;
 

src/tests/end2end_tests/SRGBTextureTest.cpp → src/tests/gl_tests/SRGBTextureTest.cpp

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

src/tests/end2end_tests/SimpleOperationTest.cpp → src/tests/gl_tests/SimpleOperationTest.cpp

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

src/tests/end2end_tests/SwizzleTest.cpp → src/tests/gl_tests/SwizzleTest.cpp

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

src/tests/end2end_tests/TextureTest.cpp → src/tests/gl_tests/TextureTest.cpp

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

src/tests/end2end_tests/TransformFeedbackTest.cpp → src/tests/gl_tests/TransformFeedbackTest.cpp

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

src/tests/end2end_tests/UniformBufferTest.cpp → src/tests/gl_tests/UniformBufferTest.cpp

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

src/tests/end2end_tests/UniformTest.cpp → src/tests/gl_tests/UniformTest.cpp

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

src/tests/end2end_tests/UnpackAlignmentTest.cpp → src/tests/gl_tests/UnpackAlignmentTest.cpp

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

src/tests/end2end_tests/UnpackRowLength.cpp → src/tests/gl_tests/UnpackRowLength.cpp

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

src/tests/end2end_tests/VertexAttributeTest.cpp → src/tests/gl_tests/VertexAttributeTest.cpp

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

src/tests/end2end_tests/ViewportTest.cpp → src/tests/gl_tests/ViewportTest.cpp

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