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: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>

Tell GN about the dependecy of dEQP tests on expectations
ae786455 · Corentin Wallez · 9b4e8626 · ae786455
Commit ae786455 authored Feb 01, 2016 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

BUILD.gn src/tests/BUILD.gn +9 -5

No files found.
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -250,7 +250,7 @@ if (build_angle_deqp_tests) {
    }
  }

-  target_names = [
+  api_names = [
    "gles2",
    "gles3",
    "egl",
@@ -272,13 +272,13 @@ if (build_angle_deqp_tests) {
            1,
            2,
          ]) {
-    target_name = target_names[index]
-    config_name = "angle_deqp_lib${target_name}_config"
+    api_name = api_names[index]
+    config_name = "angle_deqp_lib${api_name}_config"
    config(config_name) {
      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) {
      deps = [
        ":angle_deqp_libtester",
@@ -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) {
      deps = [
        ":${shared_library_name}",
@@ -307,6 +307,10 @@ if (build_angle_deqp_tests) {
        "deqp_support/angle_deqp_gtest.cpp",
      ]

+      data = [
+        "deqp_support/deqp_${api_name}_test_expectations.txt",
+      ]
+
      if (is_linux && !is_component_build) {
        # Set rpath to find *.so files even in a non-component build.
        configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]