Skip to content

A
angle
Commit 5491fe66 by Jamie Madill
Options

Revert "Move the ANGLE tests project to src/"

Causing build break in Chromium. This reverts commit 71c2d85c. Change-Id: Iedf001c1f4c60a759f69009610fbce978d193d17 Reviewed-on: https://chromium-review.googlesource.com/260370Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 71c2d85c
Showing with 203 additions and 186 deletions
.gitignore
...@@ -22,12 +22,12 @@ debug.txt ...@@ -22,12 +22,12 @@ debug.txt
*.rej *.rej
.gclient_entries .gclient_entries
/third_party /third_party
/src/tests/third_party/googlemock /tests/third_party/googlemock
/src/tests/third_party/googletest /tests/third_party/googletest
/src/tests/third_party/libpng /tests/third_party/libpng
/src/tests/third_party/zlib /tests/third_party/zlib
/src/tests/third_party/deqp /tests/third_party/deqp
/src/tests/third_party/gles_conformance_tests /tests/third_party/gles_conformance_tests
out out
lib/* lib/*
Makefile Makefile
......
DEPS
...@@ -4,10 +4,10 @@ deps = { ...@@ -4,10 +4,10 @@ deps = {
# TODO(kbr): figure out how to better stay in sync with Chromium's # TODO(kbr): figure out how to better stay in sync with Chromium's
# versions of googletest and googlemock. # versions of googletest and googlemock.
"src/tests/third_party/googletest": "tests/third_party/googletest":
"http://googletest.googlecode.com/svn/trunk@629", "http://googletest.googlecode.com/svn/trunk@629",
"src/tests/third_party/googlemock": "tests/third_party/googlemock":
"http://googlemock.googlecode.com/svn/trunk@410", "http://googlemock.googlecode.com/svn/trunk@410",
} }
......
build/ANGLE.gyp → build/all.gyp
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
'targets': 'targets':
[ [
{ {
'target_name': 'all', 'target_name': 'All',
'type': 'none', 'type': 'none',
'dependencies': 'dependencies':
[ [
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
'dependencies': 'dependencies':
[ [
'../samples/samples.gyp:*', '../samples/samples.gyp:*',
'../src/tests/tests.gyp:*', '../tests/tests.gyp:*',
], ],
}], }],
], ],
......
build/common.gypi
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
'includes': [ 'common_defines.gypi', ], 'includes': [ 'common_defines.gypi', ],
'variables': 'variables':
{ {
'angle_path%': '<(DEPTH)',
'angle_build_winrt%': '0', 'angle_build_winrt%': '0',
'angle_build_winphone%': '0', 'angle_build_winphone%': '0',
# angle_code is set to 1 for the core ANGLE targets defined in src/build_angle.gyp. # angle_code is set to 1 for the core ANGLE targets defined in src/build_angle.gyp.
...@@ -116,14 +115,14 @@ ...@@ -116,14 +115,14 @@
# Windows Application Store requirements # Windows Application Store requirements
# The C runtime for Windows Store applications # The C runtime for Windows Store applications
# is a framework package that is managed by # is a framework package that is managed by
# the Windows deployment model and can be # the Windows deployment model and can be
# shared by multiple packages. # shared by multiple packages.
'RuntimeLibrary': '3', # /MDd (debug dll) 'RuntimeLibrary': '3', # /MDd (debug dll)
}, },
{ {
# Use the static C runtime to # Use the static C runtime to
# match chromium and make sure # match chromium and make sure
# we don't depend on the dynamic # we don't depend on the dynamic
# runtime's shared heaps # runtime's shared heaps
...@@ -175,13 +174,13 @@ ...@@ -175,13 +174,13 @@
# Windows Application Store requirements # Windows Application Store requirements
# The C runtime for Windows Store applications # The C runtime for Windows Store applications
# is a framework package that is managed by # is a framework package that is managed by
# the Windows deployment model and can be # the Windows deployment model and can be
# shared by multiple packages. # shared by multiple packages.
'RuntimeLibrary': '2', # /MD (nondebug dll) 'RuntimeLibrary': '2', # /MD (nondebug dll)
}, },
{ {
# Use the static C runtime to # Use the static C runtime to
# match chromium and make sure # match chromium and make sure
# we don't depend on the dynamic # we don't depend on the dynamic
'RuntimeLibrary': '0', # /MT (nondebug static) 'RuntimeLibrary': '0', # /MT (nondebug static)
......
build/common_defines.gypi
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
'variables': 'variables':
{ {
'component%': 'static_library', 'component%': 'static_library',
'angle_path%': '..',
'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1', 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1',
'angle_build_winrt%': '0', 'angle_build_winrt%': '0',
'angle_build_winphone%': '0', 'angle_build_winphone%': '0',
......
build/gyp_angle
...@@ -33,5 +33,5 @@ if __name__ == '__main__': ...@@ -33,5 +33,5 @@ if __name__ == '__main__':
# a Chromium workspace). # a Chromium workspace).
args.append('-Dangle_standalone=1') args.append('-Dangle_standalone=1')
# Add all.gyp as the main gyp file to be generated. # Add all.gyp as the main gyp file to be generated.
args.append(os.path.join(script_dir, 'ANGLE.gyp')) args.append(os.path.join(script_dir, 'all.gyp'))
sys.exit(gyp.main(args)) sys.exit(gyp.main(args))
src/tests/angle_end2end_tests.gypi deleted 100644 → 0
# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# This .gypi describes all of the sources and dependencies to build a
# unified "angle_end2end_tests" target, which contains all of the
# tests that exercise the ANGLE implementation. It requires a parent
# target to include this gypi in an executable target containing a
# gtest harness in a main.cpp.
{
'variables':
{
# 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/BindTexImageTest.cpp',
'<(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/FramebufferFormatsTest.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/PointSpritesTest.cpp',
'<(angle_path)/src/tests/end2end_tests/ProgramBinaryTest.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/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/standalone_tests/EGLThreadTest.cpp',
'<(angle_path)/src/tests/standalone_tests/EGLQueryContextTest.cpp',
],
},
'dependencies':
[
'<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/src/angle.gyp:libGLESv2',
'<(angle_path)/src/tests/tests.gyp:angle_test_support',
'<(angle_path)/util/util.gyp:angle_util',
],
'include_dirs':
[
'<(angle_path)/include',
'end2end_tests',
],
'sources':
[
'<@(angle_end2end_tests_sources)',
],
}
src/tests/angle_unittests.gypi deleted 100644 → 0
# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# This .gypi describes all of the sources and dependencies to build a
# unified "angle_unittests" target, which contains all of ANGLE's
# tests that don't require a fully functional ANGLE in order to run
# (compiler tests, preprocessor tests, etc.). It requires a parent
# target to include this gypi in an executable target containing a
# gtest harness in a main.cpp.
{
'variables':
{
# This file list will be shared with the GN build.
'angle_unittests_sources':
[
'<(angle_path)/src/libANGLE/Config_unittest.cpp',
'<(angle_path)/src/libANGLE/Fence_unittest.cpp',
'<(angle_path)/src/libANGLE/ImageIndexIterator_unittest.cpp',
'<(angle_path)/src/libANGLE/Surface_unittest.cpp',
'<(angle_path)/src/libANGLE/TransformFeedback_unittest.cpp',
'<(angle_path)/src/tests/compiler_tests/API_test.cpp',
'<(angle_path)/src/tests/compiler_tests/CollectVariables_test.cpp',
'<(angle_path)/src/tests/compiler_tests/ConstantFolding_test.cpp',
'<(angle_path)/src/tests/compiler_tests/DebugShaderPrecision_test.cpp',
'<(angle_path)/src/tests/compiler_tests/ExpressionLimit_test.cpp',
'<(angle_path)/src/tests/compiler_tests/ShaderExtension_test.cpp',
'<(angle_path)/src/tests/compiler_tests/NV_draw_buffers_test.cpp',
'<(angle_path)/src/tests/compiler_tests/ShaderVariable_test.cpp',
'<(angle_path)/src/tests/compiler_tests/TypeTracking_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/char_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/comment_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/define_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/error_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/extension_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/identifier_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/if_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/input_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/location_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/MockDiagnostics.h',
'<(angle_path)/src/tests/preprocessor_tests/MockDirectiveHandler.h',
'<(angle_path)/src/tests/preprocessor_tests/number_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/operator_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/pragma_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/PreprocessorTest.cpp',
'<(angle_path)/src/tests/preprocessor_tests/PreprocessorTest.h',
'<(angle_path)/src/tests/preprocessor_tests/space_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/token_test.cpp',
'<(angle_path)/src/tests/preprocessor_tests/version_test.cpp',
],
},
'dependencies':
[
'<(angle_path)/src/angle.gyp:libANGLE',
'<(angle_path)/src/angle.gyp:preprocessor',
'<(angle_path)/src/angle.gyp:translator_static',
'<(angle_path)/src/tests/tests.gyp:angle_test_support',
],
'include_dirs':
[
'<(angle_path)/include',
'<(angle_path)/src',
'<(angle_path)/src/compiler/preprocessor',
],
'sources':
[
'<@(angle_unittests_sources)',
],
'conditions':
[
['angle_build_winrt==1',
{
'sources':
[
'<(angle_path)/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow_unittest.cpp',
'<(angle_path)/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow_unittest.cpp',
],
'defines':
[
'ANGLE_ENABLE_D3D11',
],
'msvs_settings':
{
'VCLinkerTool':
{
'AdditionalDependencies':
[
'runtimeobject.lib',
],
},
},
}],
],
}
tests/angle_end2end_tests.gypi 0 → 100644
# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# This .gypi describes all of the sources and dependencies to build a
# unified "angle_end2end_tests" target, which contains all of the
# tests that exercise the ANGLE implementation. It requires a parent
# target to include this gypi in an executable target containing a
# gtest harness in a main.cpp.
{
'variables':
{
# This file list will be shared with the GN build.
'angle_end2end_tests_sources':
[
'<(angle_path)/tests/angle_tests/ANGLETest.cpp',
'<(angle_path)/tests/angle_tests/ANGLETest.h',
'<(angle_path)/tests/angle_tests/BindTexImageTest.cpp',
'<(angle_path)/tests/angle_tests/BlendMinMaxTest.cpp',
'<(angle_path)/tests/angle_tests/BlitFramebufferANGLETest.cpp',
'<(angle_path)/tests/angle_tests/BufferDataTest.cpp',
'<(angle_path)/tests/angle_tests/ClearTest.cpp',
'<(angle_path)/tests/angle_tests/CompressedTextureTest.cpp',
'<(angle_path)/tests/angle_tests/CubeMapTextureTest.cpp',
'<(angle_path)/tests/angle_tests/DepthStencilFormatsTest.cpp',
'<(angle_path)/tests/angle_tests/DrawBuffersTest.cpp',
'<(angle_path)/tests/angle_tests/FramebufferFormatsTest.cpp',
'<(angle_path)/tests/angle_tests/GLSLTest.cpp',
'<(angle_path)/tests/angle_tests/IncompleteTextureTest.cpp',
'<(angle_path)/tests/angle_tests/IndexedPointsTest.cpp',
'<(angle_path)/tests/angle_tests/InstancingTest.cpp',
'<(angle_path)/tests/angle_tests/LineLoopTest.cpp',
'<(angle_path)/tests/angle_tests/MaxTextureSizeTest.cpp',
'<(angle_path)/tests/angle_tests/MipmapTest.cpp',
'<(angle_path)/tests/angle_tests/media/pixel.inl',
'<(angle_path)/tests/angle_tests/OcclusionQueriesTest.cpp',
'<(angle_path)/tests/angle_tests/PBOExtensionTest.cpp',
'<(angle_path)/tests/angle_tests/PointSpritesTest.cpp',
'<(angle_path)/tests/angle_tests/ProgramBinaryTest.cpp',
'<(angle_path)/tests/angle_tests/ReadPixelsTest.cpp',
'<(angle_path)/tests/angle_tests/RendererTest.cpp',
'<(angle_path)/tests/angle_tests/SimpleOperationTest.cpp',
'<(angle_path)/tests/angle_tests/SRGBTextureTest.cpp',
'<(angle_path)/tests/angle_tests/SwizzleTest.cpp',
'<(angle_path)/tests/angle_tests/TextureTest.cpp',
'<(angle_path)/tests/angle_tests/TransformFeedbackTest.cpp',
'<(angle_path)/tests/angle_tests/UniformTest.cpp',
'<(angle_path)/tests/angle_tests/UnpackAlignmentTest.cpp',
'<(angle_path)/tests/angle_tests/UnpackRowLength.cpp',
'<(angle_path)/tests/angle_tests/VertexAttributeTest.cpp',
'<(angle_path)/tests/angle_tests/ViewportTest.cpp',
'<(angle_path)/tests/standalone_tests/EGLThreadTest.cpp',
'<(angle_path)/tests/standalone_tests/EGLQueryContextTest.cpp',
],
},
'dependencies':
[
'<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/src/angle.gyp:libGLESv2',
'<(angle_path)/tests/tests.gyp:angle_test_support',
'<(angle_path)/util/util.gyp:angle_util',
],
'include_dirs':
[
'../include',
'angle_tests',
],
'sources':
[
'<@(angle_end2end_tests_sources)',
],
}
tests/angle_implementation_unit_tests/angle_implementation_unit_tests.gypi 0 → 100644
# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'sources':
[
'Config_unittest.cpp',
'Fence_unittest.cpp',
'ImageIndexIterator_unittest.cpp',
'Surface_unittest.cpp',
'TransformFeedback_unittest.cpp'
],
'conditions':
[
['angle_build_winrt==1',
{
'sources':
[
'CoreWindowNativeWindow_unittest.cpp',
'SwapChainPanelNativeWindow_unittest.cpp',
],
'defines':
[
'ANGLE_ENABLE_D3D11',
],
'msvs_settings':
{
'VCLinkerTool':
{
'AdditionalDependencies':
[
'runtimeobject.lib',
],
},
},
}],
],
}
tests/angle_unittests.gypi
...@@ -2,11 +2,84 @@ ...@@ -2,11 +2,84 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
# TODO(jmadill): update Chromium's pointers to src/tests # This .gypi describes all of the sources and dependencies to build a
# unified "angle_unittests" target, which contains all of ANGLE's
# tests that don't require a fully functional ANGLE in order to run
# (compiler tests, preprocessor tests, etc.). It requires a parent
# target to include this gypi in an executable target containing a
# gtest harness in a main.cpp.
{ {
'variables':
{
# This file list will be shared with the GN build.
'angle_unittests_sources':
[
'<(angle_path)/tests/compiler_tests/API_test.cpp',
'<(angle_path)/tests/compiler_tests/CollectVariables_test.cpp',
'<(angle_path)/tests/compiler_tests/ConstantFolding_test.cpp',
'<(angle_path)/tests/compiler_tests/DebugShaderPrecision_test.cpp',
'<(angle_path)/tests/compiler_tests/ExpressionLimit_test.cpp',
'<(angle_path)/tests/compiler_tests/ShaderExtension_test.cpp',
'<(angle_path)/tests/compiler_tests/NV_draw_buffers_test.cpp',
'<(angle_path)/tests/compiler_tests/ShaderVariable_test.cpp',
'<(angle_path)/tests/compiler_tests/TypeTracking_test.cpp',
'<(angle_path)/tests/preprocessor_tests/char_test.cpp',
'<(angle_path)/tests/preprocessor_tests/comment_test.cpp',
'<(angle_path)/tests/preprocessor_tests/define_test.cpp',
'<(angle_path)/tests/preprocessor_tests/error_test.cpp',
'<(angle_path)/tests/preprocessor_tests/extension_test.cpp',
'<(angle_path)/tests/preprocessor_tests/identifier_test.cpp',
'<(angle_path)/tests/preprocessor_tests/if_test.cpp',
'<(angle_path)/tests/preprocessor_tests/input_test.cpp',
'<(angle_path)/tests/preprocessor_tests/location_test.cpp',
'<(angle_path)/tests/preprocessor_tests/MockDiagnostics.h',
'<(angle_path)/tests/preprocessor_tests/MockDirectiveHandler.h',
'<(angle_path)/tests/preprocessor_tests/number_test.cpp',
'<(angle_path)/tests/preprocessor_tests/operator_test.cpp',
'<(angle_path)/tests/preprocessor_tests/pragma_test.cpp',
'<(angle_path)/tests/preprocessor_tests/PreprocessorTest.cpp',
'<(angle_path)/tests/preprocessor_tests/PreprocessorTest.h',
'<(angle_path)/tests/preprocessor_tests/space_test.cpp',
'<(angle_path)/tests/preprocessor_tests/token_test.cpp',
'<(angle_path)/tests/preprocessor_tests/version_test.cpp',
],
},
'dependencies':
[
'<(angle_path)/src/angle.gyp:libANGLE',
'<(angle_path)/src/angle.gyp:preprocessor',
'<(angle_path)/src/angle.gyp:translator_static',
'<(angle_path)/tests/tests.gyp:angle_test_support',
],
'include_dirs':
[
'../include',
'../src',
'../src/compiler/preprocessor',
],
'includes': 'includes':
[ [
'<(angle_path)/src/tests/angle_unittests.gypi', 'angle_implementation_unit_tests/angle_implementation_unit_tests.gypi',
],
'sources':
[
'<@(angle_unittests_sources)',
], ],
'msvs_settings':
{
'VCLinkerTool':
{
'conditions':
[
['angle_build_winrt==1',
{
'AdditionalDependencies':
[
'runtimeobject.lib',
],
}],
],
},
},
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment