Skip to content

A
angle
Commit e1037e9b by Frank Henigman Committed by Commit Bot
Options

Avoid rebase_path() in tests/BUILD.gn.

Adjust source paths so we don't need to use rebase_path() on all of them. BUG=angleproject:1569 Change-Id: I1af7678dd8961405446fec49731eba5294bcb586 Reviewed-on: https://chromium-review.googlesource.com/1196046 Commit-Queue: Frank Henigman <fjhenigman@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 5fdc38cf
Showing with 79 additions and 83 deletions
src/tests/BUILD.gn
...@@ -89,10 +89,10 @@ if (build_with_chromium) { ...@@ -89,10 +89,10 @@ if (build_with_chromium) {
test("angle_unittests") { test("angle_unittests") {
include_dirs = [ "$angle_root/src" ] include_dirs = [ "$angle_root/src" ]
sources = rebase_path(angle_unittests_sources, ".", "../..") sources = angle_unittests_sources
if (angle_enable_hlsl) { if (angle_enable_hlsl) {
sources += rebase_path(angle_unittests_hlsl_sources, ".", "../..") sources += angle_unittests_hlsl_sources
defines = [ "ANGLE_ENABLE_HLSL" ] defines = [ "ANGLE_ENABLE_HLSL" ]
} }
...@@ -126,21 +126,21 @@ if (is_win || is_linux || is_mac || is_android) { ...@@ -126,21 +126,21 @@ if (is_win || is_linux || is_mac || is_android) {
use_native_activity = true use_native_activity = true
} }
sources = rebase_path(angle_end2end_tests_sources, ".", "../..") sources = angle_end2end_tests_sources
libs = [] libs = []
if (is_mac) { if (is_mac) {
sources += rebase_path(angle_end2end_tests_mac_sources, ".", "../..") sources += angle_end2end_tests_mac_sources
libs += [ libs += [
"CoreFoundation.framework", "CoreFoundation.framework",
"IOSurface.framework", "IOSurface.framework",
] ]
} }
if (is_win) { if (is_win) {
sources += rebase_path(angle_end2end_tests_win_sources, ".", "../..") sources += angle_end2end_tests_win_sources
} }
if (use_x11) { if (use_x11) {
sources += rebase_path(angle_end2end_tests_x11_sources, ".", "../..") sources += angle_end2end_tests_x11_sources
} }
if (build_with_chromium) { if (build_with_chromium) {
...@@ -182,10 +182,10 @@ if (is_win || is_linux || is_mac || is_android) { ...@@ -182,10 +182,10 @@ if (is_win || is_linux || is_mac || is_android) {
use_native_activity = true use_native_activity = true
} }
sources = rebase_path(angle_white_box_tests_sources, ".", "../..") sources = angle_white_box_tests_sources
if (is_win) { if (is_win) {
sources += rebase_path(angle_white_box_tests_win_sources, ".", "../..") sources += angle_white_box_tests_win_sources
} }
# Share the same main file as end2end_tests. # Share the same main file as end2end_tests.
...@@ -231,7 +231,7 @@ if (is_win || is_linux || is_android || is_mac) { ...@@ -231,7 +231,7 @@ if (is_win || is_linux || is_android || is_mac) {
"../../util", "../../util",
] ]
sources = rebase_path(angle_perf_tests_sources, ".", "../..") sources = angle_perf_tests_sources
deps = googletest_deps + [ deps = googletest_deps + [
angle_root + ":angle_util_static", angle_root + ":angle_util_static",
...@@ -246,15 +246,13 @@ if (is_win || is_linux || is_android || is_mac) { ...@@ -246,15 +246,13 @@ if (is_win || is_linux || is_android || is_mac) {
} }
if (is_win) { if (is_win) {
sources += rebase_path(angle_perf_tests_win_sources, ".", "../..") sources += angle_perf_tests_win_sources
} }
if (angle_enable_vulkan) { if (angle_enable_vulkan) {
sources += rebase_path(angle_perf_tests_vulkan_sources, ".", "../..") sources += angle_perf_tests_vulkan_sources
if (is_android || is_linux) { if (is_android || is_linux) {
sources += rebase_path(angle_perf_tests_vulkan_command_buffer_sources, sources += angle_perf_tests_vulkan_command_buffer_sources
".",
"../..")
} }
deps += [ "$angle_root/third_party/glslang:glslang" ] deps += [ "$angle_root/third_party/glslang:glslang" ]
public_configs = [ "$angle_root/third_party/glslang:glslang_config" ] public_configs = [ "$angle_root/third_party/glslang:glslang_config" ]
...@@ -490,7 +488,7 @@ if (build_angle_deqp_tests) { ...@@ -490,7 +488,7 @@ if (build_angle_deqp_tests) {
import("deqp.gni") import("deqp.gni")
config("angle_deqp_support") { config("angle_deqp_support") {
include_dirs = rebase_path(deqp_include_dirs, ".", "../..") include_dirs = deqp_include_dirs
if (is_win && !is_clang) { if (is_win && !is_clang) {
include_dirs += include_dirs +=
[ "$angle_root/third_party/deqp/src/framework/platform/win32" ] [ "$angle_root/third_party/deqp/src/framework/platform/win32" ]
...@@ -582,7 +580,7 @@ if (build_angle_deqp_tests) { ...@@ -582,7 +580,7 @@ if (build_angle_deqp_tests) {
] ]
} }
sources = rebase_path(deqp_libtester_decpp_sources, ".", "../..") sources = deqp_libtester_decpp_sources
} }
config("angle_deqp_libtester_config") { config("angle_deqp_libtester_config") {
...@@ -615,15 +613,15 @@ if (build_angle_deqp_tests) { ...@@ -615,15 +613,15 @@ if (build_angle_deqp_tests) {
configs -= deqp_undefine_configs configs -= deqp_undefine_configs
public_configs = [ ":angle_deqp_libtester_config" ] public_configs = [ ":angle_deqp_libtester_config" ]
sources = rebase_path(deqp_libtester_sources, ".", "../..") sources = deqp_libtester_sources
if (is_win) { if (is_win) {
sources += rebase_path(deqp_libtester_sources_win, ".", "../..") sources += deqp_libtester_sources_win
} }
if (is_linux || is_android || is_mac) { if (is_linux || is_android || is_mac) {
sources += rebase_path(deqp_libtester_sources_unix, ".", "../..") sources += deqp_libtester_sources_unix
} }
if (is_android) { if (is_android) {
sources += rebase_path(deqp_libtester_sources_android, ".", "../..") sources += deqp_libtester_sources_android
libs = [ "log" ] libs = [ "log" ]
} }
} }
...@@ -705,7 +703,7 @@ if (build_angle_deqp_tests) { ...@@ -705,7 +703,7 @@ if (build_angle_deqp_tests) {
} }
public_configs = [ ":${config_name}" ] public_configs = [ ":${config_name}" ]
sources = rebase_path(target_sources[index], ".", "../..") sources = target_sources[index]
sources += [ sources += [
"deqp_support/angle_deqp_libtester_main.cpp", "deqp_support/angle_deqp_libtester_main.cpp",
"deqp_support/tcuANGLEPlatform.cpp", "deqp_support/tcuANGLEPlatform.cpp",
......
src/tests/angle_perftests.gni
...@@ -3,49 +3,47 @@ ...@@ -3,49 +3,47 @@
# found in the LICENSE file. # found in the LICENSE file.
angle_perf_tests_sources = [ angle_perf_tests_sources = [
"src/tests/perf_tests/ANGLEPerfTest.cpp", "perf_tests/ANGLEPerfTest.cpp",
"src/tests/perf_tests/ANGLEPerfTest.h", "perf_tests/ANGLEPerfTest.h",
"src/tests/perf_tests/BlitFramebufferPerf.cpp", "perf_tests/BlitFramebufferPerf.cpp",
"src/tests/perf_tests/BindingPerf.cpp", "perf_tests/BindingPerf.cpp",
"src/tests/perf_tests/BitSetIteratorPerf.cpp", "perf_tests/BitSetIteratorPerf.cpp",
"src/tests/perf_tests/BufferSubData.cpp", "perf_tests/BufferSubData.cpp",
"src/tests/perf_tests/CompilerPerf.cpp", "perf_tests/CompilerPerf.cpp",
"src/tests/perf_tests/DispatchComputePerf.cpp", "perf_tests/DispatchComputePerf.cpp",
"src/tests/perf_tests/DrawCallPerf.cpp", "perf_tests/DrawCallPerf.cpp",
"src/tests/perf_tests/DrawCallPerfParams.cpp", "perf_tests/DrawCallPerfParams.cpp",
"src/tests/perf_tests/DrawCallPerfParams.h", "perf_tests/DrawCallPerfParams.h",
"src/tests/perf_tests/DrawElementsPerf.cpp", "perf_tests/DrawElementsPerf.cpp",
"src/tests/perf_tests/DynamicPromotionPerfTest.cpp", "perf_tests/DynamicPromotionPerfTest.cpp",
"src/tests/perf_tests/EGLInitializePerf.cpp", "perf_tests/EGLInitializePerf.cpp",
"src/tests/perf_tests/EGLMakeCurrentPerf.cpp", "perf_tests/EGLMakeCurrentPerf.cpp",
"src/tests/perf_tests/ResultPerf.cpp", "perf_tests/ResultPerf.cpp",
"src/tests/perf_tests/IndexConversionPerf.cpp", "perf_tests/IndexConversionPerf.cpp",
"src/tests/perf_tests/InstancingPerf.cpp", "perf_tests/InstancingPerf.cpp",
"src/tests/perf_tests/InterleavedAttributeData.cpp", "perf_tests/InterleavedAttributeData.cpp",
"src/tests/perf_tests/LinkProgramPerfTest.cpp", "perf_tests/LinkProgramPerfTest.cpp",
"src/tests/perf_tests/MultiviewPerf.cpp", "perf_tests/MultiviewPerf.cpp",
"src/tests/perf_tests/PointSprites.cpp", "perf_tests/PointSprites.cpp",
"src/tests/perf_tests/TexSubImage.cpp", "perf_tests/TexSubImage.cpp",
"src/tests/perf_tests/TextureSampling.cpp", "perf_tests/TextureSampling.cpp",
"src/tests/perf_tests/TexturesPerf.cpp", "perf_tests/TexturesPerf.cpp",
"src/tests/perf_tests/UniformsPerf.cpp", "perf_tests/UniformsPerf.cpp",
"src/tests/perf_tests/third_party/perf/perf_test.cc", "perf_tests/third_party/perf/perf_test.cc",
"src/tests/perf_tests/third_party/perf/perf_test.h", "perf_tests/third_party/perf/perf_test.h",
"src/tests/test_utils/angle_test_configs.cpp", "test_utils/angle_test_configs.cpp",
"src/tests/test_utils/angle_test_configs.h", "test_utils/angle_test_configs.h",
"src/tests/test_utils/angle_test_instantiate.cpp", "test_utils/angle_test_instantiate.cpp",
"src/tests/test_utils/angle_test_instantiate.h", "test_utils/angle_test_instantiate.h",
"src/tests/test_utils/draw_call_perf_utils.cpp", "test_utils/draw_call_perf_utils.cpp",
"src/tests/test_utils/draw_call_perf_utils.h", "test_utils/draw_call_perf_utils.h",
] ]
angle_perf_tests_win_sources = angle_perf_tests_win_sources = [ "perf_tests/IndexDataManagerTest.cpp" ]
[ "src/tests/perf_tests/IndexDataManagerTest.cpp" ] angle_perf_tests_vulkan_sources = [ "perf_tests/VulkanPipelineCachePerf.cpp" ]
angle_perf_tests_vulkan_sources =
[ "src/tests/perf_tests/VulkanPipelineCachePerf.cpp" ]
# Currently Vulkan Command Buffer Perf Tests compile on Android/Linux # Currently Vulkan Command Buffer Perf Tests compile on Android/Linux
angle_perf_tests_vulkan_command_buffer_sources = [ angle_perf_tests_vulkan_command_buffer_sources = [
"src/tests/perf_tests/VulkanCommandBufferPerf.cpp", "perf_tests/VulkanCommandBufferPerf.cpp",
"src/tests/test_utils/third_party/vulkan_command_buffer_utils.cpp", "test_utils/third_party/vulkan_command_buffer_utils.cpp",
"src/tests/test_utils/third_party/vulkan_command_buffer_utils.h", "test_utils/third_party/vulkan_command_buffer_utils.h",
] ]
src/tests/angle_white_box_tests.gni
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
# found in the LICENSE file. # found in the LICENSE file.
angle_white_box_tests_sources = [ angle_white_box_tests_sources = [
"src/tests/util_tests/PrintSystemInfoTest.cpp", "util_tests/PrintSystemInfoTest.cpp",
"src/tests/test_utils/angle_test_configs.cpp", "test_utils/angle_test_configs.cpp",
"src/tests/test_utils/angle_test_configs.h", "test_utils/angle_test_configs.h",
"src/tests/test_utils/angle_test_instantiate.cpp", "test_utils/angle_test_instantiate.cpp",
"src/tests/test_utils/angle_test_instantiate.h", "test_utils/angle_test_instantiate.h",
"src/tests/test_utils/ANGLETest.cpp", "test_utils/ANGLETest.cpp",
"src/tests/test_utils/ANGLETest.h", "test_utils/ANGLETest.h",
"src/tests/test_utils/gl_raii.h", "test_utils/gl_raii.h",
] ]
angle_white_box_tests_win_sources = [ angle_white_box_tests_win_sources = [
"src/tests/gl_tests/D3D11EmulatedIndexedBufferTest.cpp", "gl_tests/D3D11EmulatedIndexedBufferTest.cpp",
"src/tests/gl_tests/D3D11FormatTablesTest.cpp", "gl_tests/D3D11FormatTablesTest.cpp",
"src/tests/gl_tests/D3D11InputLayoutCacheTest.cpp", "gl_tests/D3D11InputLayoutCacheTest.cpp",
"src/tests/gl_tests/D3DTextureTest.cpp", "gl_tests/D3DTextureTest.cpp",
"src/tests/gl_tests/ErrorMessages.cpp", "gl_tests/ErrorMessages.cpp",
] ]
src/tests/deqp.gni
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# found in the LICENSE file. # found in the LICENSE file.
# leading underscore makes this a local variable # leading underscore makes this a local variable
_deqp_path = "third_party/deqp/src" _deqp_path = "../../third_party/deqp/src"
deqp_include_dirs = [ deqp_include_dirs = [
"$_deqp_path/executor", "$_deqp_path/executor",
...@@ -992,8 +992,8 @@ deqp_libtester_sources = [ ...@@ -992,8 +992,8 @@ deqp_libtester_sources = [
# TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564 # TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564
#"$_deqp_path/framework/egl/egluNativeDisplay.cpp", #"$_deqp_path/framework/egl/egluNativeDisplay.cpp",
"src/tests/deqp_support/egluNativeDisplay_override.cpp", "deqp_support/egluNativeDisplay_override.cpp",
"src/tests/deqp_support/egluNativeDisplay_override.hpp", "deqp_support/egluNativeDisplay_override.hpp",
"$_deqp_path/framework/egl/egluNativePixmap.cpp", "$_deqp_path/framework/egl/egluNativePixmap.cpp",
"$_deqp_path/framework/egl/egluNativeWindow.cpp", "$_deqp_path/framework/egl/egluNativeWindow.cpp",
"$_deqp_path/framework/egl/egluPlatform.cpp", "$_deqp_path/framework/egl/egluPlatform.cpp",
...@@ -1003,7 +1003,7 @@ deqp_libtester_sources = [ ...@@ -1003,7 +1003,7 @@ deqp_libtester_sources = [
# TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564 # TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564
#"$_deqp_path/framework/egl/egluUtil.cpp", #"$_deqp_path/framework/egl/egluUtil.cpp",
"src/tests/deqp_support/egluUtil_override.cpp", "deqp_support/egluUtil_override.cpp",
"$_deqp_path/framework/egl/wrapper/eglwDefs.cpp", "$_deqp_path/framework/egl/wrapper/eglwDefs.cpp",
"$_deqp_path/framework/egl/wrapper/eglwFunctions.cpp", "$_deqp_path/framework/egl/wrapper/eglwFunctions.cpp",
"$_deqp_path/framework/egl/wrapper/eglwLibrary.cpp", "$_deqp_path/framework/egl/wrapper/eglwLibrary.cpp",
...@@ -1119,12 +1119,12 @@ deqp_libtester_sources = [ ...@@ -1119,12 +1119,12 @@ deqp_libtester_sources = [
"$_deqp_path/modules/glshared/glsTextureTestUtil.cpp", "$_deqp_path/modules/glshared/glsTextureTestUtil.cpp",
"$_deqp_path/modules/glshared/glsUniformBlockCase.cpp", "$_deqp_path/modules/glshared/glsUniformBlockCase.cpp",
"$_deqp_path/modules/glshared/glsVertexArrayTests.cpp", "$_deqp_path/modules/glshared/glsVertexArrayTests.cpp",
"src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp", "deqp_support/tcuANGLENativeDisplayFactory.cpp",
"src/tests/deqp_support/tcuANGLENativeDisplayFactory.h", "deqp_support/tcuANGLENativeDisplayFactory.h",
# TODO(jmadill): integrate with dEQP # TODO(jmadill): integrate with dEQP
"src/tests/deqp_support/tcuRandomOrderExecutor.cpp", "deqp_support/tcuRandomOrderExecutor.cpp",
"src/tests/deqp_support/tcuRandomOrderExecutor.h", "deqp_support/tcuRandomOrderExecutor.h",
] ]
deqp_libtester_sources_win = [ deqp_libtester_sources_win = [
"$_deqp_path/framework/delibs/dethread/win32/deMutexWin32.c", "$_deqp_path/framework/delibs/dethread/win32/deMutexWin32.c",
......
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