Skip to content

A
angle
Commit ae786455 by Corentin Wallez
Options

Tell GN about the dependecy of dEQP tests on expectations

Without this, gn-built isolates do not include the test expectations file in the isolate, causing the test suite to bail out at startup. Also rename target_name to api_name as target_name is a special variable name when inside a target definition. BUG=580045 Change-Id: I20be39c7e50e24757a0828f9056613e171f0002f Reviewed-on: https://chromium-review.googlesource.com/325040Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
parent 9b4e8626
Showing with 9 additions and 5 deletions
src/tests/BUILD.gn
...@@ -250,7 +250,7 @@ if (build_angle_deqp_tests) { ...@@ -250,7 +250,7 @@ if (build_angle_deqp_tests) {
} }
} }
target_names = [ api_names = [
"gles2", "gles2",
"gles3", "gles3",
"egl", "egl",
...@@ -272,13 +272,13 @@ if (build_angle_deqp_tests) { ...@@ -272,13 +272,13 @@ if (build_angle_deqp_tests) {
1, 1,
2, 2,
]) { ]) {
target_name = target_names[index] api_name = api_names[index]
config_name = "angle_deqp_lib${target_name}_config" config_name = "angle_deqp_lib${api_name}_config"
config(config_name) { config(config_name) {
defines = [ target_defines[index] ] defines = [ target_defines[index] ]
} }
shared_library_name = "angle_deqp_lib${target_name}" shared_library_name = "angle_deqp_lib${api_name}"
shared_library(shared_library_name) { shared_library(shared_library_name) {
deps = [ deps = [
":angle_deqp_libtester", ":angle_deqp_libtester",
...@@ -295,7 +295,7 @@ if (build_angle_deqp_tests) { ...@@ -295,7 +295,7 @@ if (build_angle_deqp_tests) {
] ]
} }
test_name = "angle_deqp_${target_name}_tests" test_name = "angle_deqp_${api_name}_tests"
test(test_name) { test(test_name) {
deps = [ deps = [
":${shared_library_name}", ":${shared_library_name}",
...@@ -307,6 +307,10 @@ if (build_angle_deqp_tests) { ...@@ -307,6 +307,10 @@ if (build_angle_deqp_tests) {
"deqp_support/angle_deqp_gtest.cpp", "deqp_support/angle_deqp_gtest.cpp",
] ]
data = [
"deqp_support/deqp_${api_name}_test_expectations.txt",
]
if (is_linux && !is_component_build) { if (is_linux && !is_component_build) {
# Set rpath to find *.so files even in a non-component build. # Set rpath to find *.so files even in a non-component build.
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
......
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