Rename XCTests test main target and output.

build/config/ios/rules.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/ios/ios_sdk.gni")
 import("//build/config/mac/base_rules.gni")
 import("//build/config/mac/symbols.gni")
 import("//build/toolchain/toolchain.gni")
 
 # Invokes lipo on multiple arch-specific binaries to create a fat binary.
@@ skipping 1250 matching lines @@
 # (Debug, Release, ...). In addition, the symbols visibility is configured to
 # private by default. To simplify testing with those constraints, our tests are
 # compiled in the TEST_HOST target instead of the .xctest bundle.
 template("ios_xctest_test") {
   _target_name = target_name
   _output_name = target_name
   if (defined(invoker.output_name)) {
     _output_name = invoker.output_name
   }
 
-  _xctest_target = _target_name
-  _xctest_output = _output_name
+  _xctest_target = _target_name + "_module"
+  _xctest_output = _output_name + "_module"
 
-  _host_target = _target_name + "_host"
-  _host_output = _output_name + "_host"
+  _host_target = _target_name
+  _host_output = _output_name
 
   _xctest_arch_loadable_module_target = _xctest_target + "_arch_loadable_module"
   _xctest_lipo_loadable_module_target = _xctest_target + "_loadable_module"
 
   loadable_module(_xctest_arch_loadable_module_target) {
     visibility = [ ":$_xctest_lipo_loadable_module_target($default_toolchain)" ]
     if (current_toolchain != default_toolchain) {
-      visibility += [ ":$_target_name" ]
+      visibility += [ ":$_xctest_target" ]
     }
 
     sources = [
       "//build/config/ios/xctest_shell.mm",
     ]
     configs += [ "//build/config/ios:xctest_config" ]
 
     output_dir = "$target_out_dir/$current_cpu"
     output_name = _xctest_output
     output_prefix_override = true
     output_extension = ""
   }
 
   if (current_toolchain != default_toolchain) {
     # For fat builds, only the default toolchain will generate a test bundle.
     # For the other toolchains, the template is only used for building the
     # arch-specific binary, thus the default target is just a group().
-    group(_target_name) {
+    group(_xctest_target) {
       forward_variables_from(invoker,
                              [
                                "visibility",
                                "testonly",
                              ])
       public_deps = [
         ":$_xctest_arch_loadable_module_target",
       ]
     }
   } else {
     _xctest_info_plist_target = _xctest_target + "_info_plist"
     _xctest_info_plist_bundle = _xctest_target + "_info_plist_bundle"
     ios_info_plist(_xctest_info_plist_target) {
       visibility = [ ":$_xctest_info_plist_bundle" ]
       info_plist = "//build/config/ios/Module-Info.plist"
-      executable_name = _output_name
+      extra_substitutions = [ "MODULE_NAME=$_xctest_output" ]
+      executable_name = _host_output
     }
 
     bundle_data(_xctest_info_plist_bundle) {
       visibility = [ ":$_xctest_target" ]
       public_deps = [
         ":$_xctest_info_plist_target",
       ]
       sources = get_target_outputs(":$_xctest_info_plist_target")
       outputs = [
         "{{bundle_root_dir}}/Info.plist",
@@ skipping 24 matching lines @@
       output_name = _xctest_output
       bundle_binary_target = ":$_xctest_lipo_loadable_module_target"
       bundle_binary_output = _xctest_output
 
       deps = [
         ":$_xctest_info_plist_bundle",
       ]
     }
 
     bundle_data(_xctest_bundle) {
-      visibility = [ ":$_host_target" ]
+      visibility = [
+        ":${_host_target}",
+        ":${_host_target}_host",

[baxley, 2016/11/04 15:26:20]

this will also go away as part of crbug.com/662404 when downstream is updated?

[sdefresne, 2016/11/04 15:57:26]

The answer would have been yes, but I tweaked the template to use a boolean
parameter (undocumented because transient) to select the naming convention. This
avoid building the app two times and avoid breaking launching them in Xcode.

I've put TODO around all code that should be removed once the downstream repo
has been fixed to use the new names.

+      ]
       public_deps = [
         ":$_xctest_target",
       ]
       sources = [
         "$root_out_dir/$_xctest_output.xctest",
       ]
       outputs = [
         "{{bundle_plugins_dir}}/$_xctest_output.xctest",
       ]
     }
@@ skipping 32 matching lines @@
       "-Xlinker",
       "-rpath",
       "-Xlinker",
       "@executable_path/Frameworks",
       "-Xlinker",
       "-rpath",
       "-Xlinker",
       "@loader_path/Frameworks",
     ]
   }
+
+  # TODO(crbug.com/662404): Remove when downstream have been changed to use
+  # the new name for the xctest app bundles.
+  ios_app_bundle(_host_target + "_host") {
+    forward_variables_from(invoker, "*", [ "testonly" ])
+
+    testonly = true
+    output_name = _host_output + "_host"
+    configs += [ "//build/config/ios:xctest_config" ]
+
+    if (!defined(invoker.info_plist) && !defined(invoker.info_plist_target)) {
+      info_plist = "//build/config/ios/Host-Info.plist"
+    }
+
+    # Xcode needs those two framework installed in the application (and signed)
+    # for the XCTest to run, so install them using extra_system_frameworks.
+    _ios_platform_library = "$ios_sdk_platform_path/Developer/Library"
+    extra_system_frameworks = [
+      "$_ios_platform_library/Frameworks/XCTest.framework",
+      "$_ios_platform_library/PrivateFrameworks/IDEBundleInjection.framework",
+    ]
+
+    if (current_toolchain == default_toolchain) {
+      if (!defined(bundle_deps)) {
+        bundle_deps = []
+      }
+      bundle_deps += [ ":$_xctest_bundle" ]
+    }
+
+    if (!defined(ldflags)) {
+      ldflags = []
+    }
+    ldflags += [
+      "-Xlinker",
+      "-rpath",
+      "-Xlinker",
+      "@executable_path/Frameworks",
+      "-Xlinker",
+      "-rpath",
+      "-Xlinker",
+      "@loader_path/Frameworks",
+    ]
+  }
 }
 
 set_defaults("ios_xctest_test") {
   configs = default_executable_configs
 }