[gn] Use nacl_test_data template for PPAPI tests

ppapi/native_client/nacl_test_data.gni

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/nacl/rules.gni")
 
 assert(enable_nacl)
 
 if (current_cpu == "pnacl") {
   if (is_nacl_nonsfi) {
@@ skipping 11 matching lines @@
 #
 # Build a Native Client based test, including any additional support files
 # and copy them over to a toolchain-specific target directory.
 #
 # Variables:
 #   output_name: name of the ouput file other than the default
 #   sources: source files for a target
 #   generate_nmf: whether to generate a manifest (default true)
 #   nonstable_pexe: use non-finalized pexe
 #   debug_pexe: copy both non-finalized and finalized pexe
 #   destination_dir: the output directory relative to the $root_build_dir

[Roland McGrath, 2016/05/06 23:07:23]

Say that it's optional and what omitting it means.

[Petr Hosek, 2016/05/06 23:21:06]

Done.

 #   test_files: additional test files to copy to $destination_dir
 #   nmfflags: additional flags for the nmf generator
 template("nacl_test_data") {
   assert(defined(invoker.sources))
-  assert(defined(invoker.destination_dir))
   forward_variables_from(invoker, [ "destination_dir" ])
 
   if (defined(invoker.output_name)) {
     output_name = invoker.output_name
   } else {
     output_name = target_name
   }
 
+  if (defined(invoker.destination_dir)) {

[Roland McGrath, 2016/05/06 23:07:23]

This needs a comment about why the cases differ.

[Petr Hosek, 2016/05/06 23:21:06]

Done.

+    target_dir =
+        "${root_build_dir}/${destination_dir}/${nacl_toolchain_variant}"
+  } else {
+    target_dir = root_build_dir
+  }
+
   if (current_cpu == "x64") {
     nmf_cpu = "x86_64"
   } else if (current_cpu == "x86") {
     nmf_cpu = "x86_32"
   } else {
     nmf_cpu = current_cpu
   }
   if (is_nacl_glibc) {
     suffix = "glibc_${nmf_cpu}"
   } else {
@@ skipping 10 matching lines @@
     pexe_translate_target_name = target_name + "_translate_pexe"
   }
   nexe_copy_target_name = target_name + "_copy_nexe"
   if (current_cpu == "pnacl" && !is_nacl_nonsfi) {
     if (defined(invoker.debug_pexe) && invoker.debug_pexe) {
       pexe_copy_debug_target_name = target_name + "_copy_pexe_debug"
     }
   }
   if (generate_nmf) {
     nmf_target_name = target_name + "_nmf"
+    if (defined(invoker.destination_dir)) {

[Roland McGrath, 2016/05/06 23:07:23]

It would be cleaner if this can be moved up to join with the
if(defiend(invoker.destination_dir)) that sets target_dir.  Then the comment
explaining the target_dir and name suffix differences can be a single comment.

[Petr Hosek, 2016/05/06 23:21:06]

Done.

+      nmf_name = output_name
+    } else {
+      if (is_nacl_nonsfi) {
+        nacl_toolchain_name = "pnacl_${nacl_toolchain_variant}"
+      } else {
+        nacl_toolchain_name = nacl_toolchain_variant
+      }
+      nmf_name = "${output_name}_${nacl_toolchain_name}"
+    }
   }
   if (defined(invoker.test_files)) {
     test_files_target_name = target_name + "_test_files"
   }
   final_target_name = target_name
 
   executable(nexe_target_name) {
     visibility = [ ":*" ]
     output_name = suffixed_output_name
     sources = invoker.sources
     forward_variables_from(invoker,
                            [
+                             "defines",

[Roland McGrath, 2016/05/06 23:07:23]

alphasort the list

[Petr Hosek, 2016/05/06 23:21:06]

Done.

+                             "include_dirs",
                              "cflags",
                              "ldflags",
                              "libs",
                            ])
     deps = [
       "//build/config/nacl:nacl_base",
       "//ppapi/native_client:ppapi_lib",
     ]
     ldflags = [ "-pthread" ]
     if (defined(invoker.deps)) {
@@ skipping 70 matching lines @@
         ]
       }
     } else if (is_nacl_nonsfi) {
       sources = get_target_outputs(":${pexe_translate_target_name}")
     } else {
       sources = [
         "${root_out_dir}/${suffixed_output_name}.nexe",
       ]
     }
     outputs = [
-      "${root_build_dir}/${destination_dir}/${nacl_toolchain_variant}/{{source_file_part}}",
+      "${target_dir}/{{source_file_part}}",
     ]
     if (is_nacl_nonsfi) {
       deps = [
         ":$pexe_translate_target_name",
       ]
     } else {
       deps = [
         ":$nexe_target_name",
       ]
     }
   }
 
   if (current_cpu == "pnacl" && !is_nacl_nonsfi) {
     if (defined(invoker.debug_pexe) && invoker.debug_pexe) {
       copy(pexe_copy_debug_target_name) {
         visibility = [ ":$final_target_name" ]
         sources = [
           "${root_out_dir}/exe.unstripped/${suffixed_output_name}.pexe",
         ]
         outputs = [
-          "${root_build_dir}/${destination_dir}/${nacl_toolchain_variant}/{{source_name_part}}.pexe.debug",
+          "${target_dir}/{{source_name_part}}.pexe.debug",
         ]
         deps = [
           ":$nexe_target_name",
         ]
       }
     }
   }
 
   if (generate_nmf) {
     if (is_nacl_nonsfi) {
       generate_nonsfi_test_nmf(nmf_target_name) {
         visibility = [ ":$final_target_name" ]
         forward_variables_from(invoker, [ "nmfflags" ])
-        nmf = "${root_build_dir}/${destination_dir}/${nacl_toolchain_variant}/${output_name}.nmf"
+        nmf = "${target_dir}/${nmf_name}.nmf"
         files = get_target_outputs(":$nexe_copy_target_name")
         executable = files[0]
         deps = [
           ":$nexe_copy_target_name",
         ]
       }
     } else {
       generate_nmf(nmf_target_name) {
         visibility = [ ":$final_target_name" ]
         forward_variables_from(invoker, [ "nmfflags" ])
-        nmf = "${root_build_dir}/${destination_dir}/${nacl_toolchain_variant}/${output_name}.nmf"
+        nmf = "${target_dir}/${nmf_name}.nmf"
         executables = get_target_outputs(":$nexe_copy_target_name")
         if (is_nacl_glibc) {
           lib_prefix = "${output_name}_libs"
-          stage_dependencies =
-              "${root_build_dir}/${destination_dir}/${nacl_toolchain_variant}"
+          stage_dependencies = target_dir
         }
         deps = [
           ":$nexe_copy_target_name",
         ]
       }
     }
   }
 
   if (defined(invoker.test_files)) {
     copy(test_files_target_name) {
       visibility = [ ":$final_target_name" ]
       sources = invoker.test_files
       outputs = [
-        "${root_build_dir}/${destination_dir}/${nacl_toolchain_variant}/{{source_file_part}}",
+        "${target_dir}/{{source_file_part}}",
       ]
     }
   }
 
   group(final_target_name) {
     data_deps = [
       ":$nexe_copy_target_name",
     ]
     if (current_cpu == "pnacl" && !is_nacl_nonsfi) {
       if (defined(invoker.debug_pexe) && invoker.debug_pexe) {
         data_deps += [ ":$pexe_copy_debug_target_name" ]
       }
     }
     if (generate_nmf) {
       data_deps += [ ":$nmf_target_name" ]
     }
     if (defined(invoker.test_files)) {
       data_deps += [ ":$test_files_target_name" ]
     }
   }
 }