Commit 71584e36 by Cody Northrop Committed by Angle LUCI CQ

Tests: Disable trace compilation for MSVC and GCC

New traces are hitting string literal limits with MSVC. Since we don't use MSVC or GCC for trace development or testing, this CL disables trace compilation for non-clang setups. Bug: b/181794064 Bug: angleproject:6009 Change-Id: I0377792a049153a5505ecda4346a3cec57c12e9e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2922682Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent d0dc22fd
......@@ -43,14 +43,14 @@
# is not necessarily so (i.e., we might have mac, win, and linux
# bots all using the 'release_bot' config).
'configs': {
'angle_goma_android_arm_debug_bot': ['angle', 'opencl', 'goma', 'android', 'arm', 'debug'],
'angle_goma_android_arm_release_bot': ['angle', 'opencl', 'goma', 'android', 'arm', 'release'],
'angle_goma_android_arm64_debug_bot': ['angle', 'opencl', 'goma', 'android', 'arm64', 'debug'],
'angle_goma_android_arm64_release_bot': ['angle', 'opencl', 'goma', 'android', 'arm64', 'release'],
'angle_goma_debug_bot': ['angle', 'opencl', 'goma', 'debug'],
'angle_goma_release_bot': ['angle', 'opencl', 'goma', 'release'],
'angle_goma_x86_debug_bot': ['angle', 'opencl', 'goma', 'x86', 'debug'],
'angle_goma_x86_release_bot': ['angle', 'opencl', 'goma', 'x86', 'release'],
'angle_goma_android_arm_debug_bot': ['angle', 'opencl', 'traces', 'goma', 'android', 'arm', 'debug'],
'angle_goma_android_arm_release_bot': ['angle', 'opencl', 'traces', 'goma', 'android', 'arm', 'release'],
'angle_goma_android_arm64_debug_bot': ['angle', 'opencl', 'traces', 'goma', 'android', 'arm64', 'debug'],
'angle_goma_android_arm64_release_bot': ['angle', 'opencl', 'traces', 'goma', 'android', 'arm64', 'release'],
'angle_goma_debug_bot': ['angle', 'opencl', 'traces', 'goma', 'debug'],
'angle_goma_release_bot': ['angle', 'opencl', 'traces', 'goma', 'release'],
'angle_goma_x86_debug_bot': ['angle', 'opencl', 'traces', 'goma', 'x86', 'debug'],
'angle_goma_x86_release_bot': ['angle', 'opencl', 'traces', 'goma', 'x86', 'release'],
'angle_non_clang_debug_bot': ['angle', 'opencl', 'non_clang', 'debug'],
'angle_non_clang_release_bot': ['angle', 'opencl', 'non_clang', 'release'],
'angle_non_clang_x86_debug_bot': ['angle', 'opencl', 'non_clang', 'x86', 'debug'],
......@@ -66,7 +66,7 @@
'gn_args': 'target_os="android"',
},
'angle': {
'gn_args': 'build_angle_gles1_conform_tests=true build_angle_trace_perf_tests=true is_component_build=true',
'gn_args': 'build_angle_gles1_conform_tests=true is_component_build=true',
},
'opencl': {
'gn_args': 'angle_enable_cl=true',
......@@ -89,6 +89,9 @@
'release': {
'gn_args': 'is_debug=false dcheck_always_on=true',
},
'traces': {
'gn_args': 'build_angle_trace_perf_tests=true',
},
'winuwp': {
'gn_args': 'target_os="winuwp"',
},
......
......@@ -382,7 +382,12 @@ if (build_angle_perftests) {
angle_source_set("angle_trace_perftests") {
testonly = true
if (build_angle_trace_perf_tests) {
# http://anglebug.com/6009: Traces with long shaders are hitting string literal
# limit in MSVC, so only compile them when using clang
assert(is_clang, "build_angle_trace_perf_tests requires is_clang")
if (is_ios) {
# shared libraries are hidden inside ios_framework_bundle, but we include headers from them
check_includes = false
......
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