Make ninja work with XCTests for iOS.

pylib/gyp/xcode_ninja.py

 # Copyright (c) 2014 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Xcode-ninja wrapper project file generator.
 
 This updates the data structures passed to the Xcode gyp generator to build
 with ninja instead. The Xcode project itself is transformed into a list of
 executable targets, each with a build step to build with ninja, and a target
 with every source and resource file.  This appears to sidestep some of the
@@ skipping 74 matching lines @@
         "%s/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)" % ninja_toplevel
 
   if 'configurations' in old_spec:
     for config in old_spec['configurations'].iterkeys():
       old_xcode_settings = \
         old_spec['configurations'][config].get('xcode_settings', {})
       if 'IPHONEOS_DEPLOYMENT_TARGET' in old_xcode_settings:
         new_xcode_settings['CODE_SIGNING_REQUIRED'] = "NO"
         new_xcode_settings['IPHONEOS_DEPLOYMENT_TARGET'] = \
             old_xcode_settings['IPHONEOS_DEPLOYMENT_TARGET']
+      for key in ['BUNDLE_LOADER', 'TEST_HOST']:
+        if key in old_xcode_settings:
+          new_xcode_settings[key] = old_xcode_settings[key]
+
       ninja_target['configurations'][config] = {}
       ninja_target['configurations'][config]['xcode_settings'] = \
           new_xcode_settings
 
   ninja_target['mac_bundle'] = old_spec.get('mac_bundle', 0)
+  ninja_target['mac_xctest_bundle'] = old_spec.get('mac_xctest_bundle', 0)
   ninja_target['ios_app_extension'] = old_spec.get('ios_app_extension', 0)
   ninja_target['ios_watchkit_extension'] = \
       old_spec.get('ios_watchkit_extension', 0)
   ninja_target['ios_watchkit_app'] = old_spec.get('ios_watchkit_app', 0)
   ninja_target['type'] = old_spec['type']
   if ninja_toplevel:
     ninja_target['actions'] = [
       {
         'action_name': 'Compile and copy %s via ninja' % target_name,
         'inputs': [],
@@ skipping 21 matching lines @@
   Arguments:
     target_extras: Regular expression to always add, matching any target.
     executable_target_pattern: Regular expression limiting executable targets.
     spec: Specifications for target.
   """
   target_name = spec.get('target_name')
   # Always include targets matching target_extras.
   if target_extras is not None and re.search(target_extras, target_name):
     return True
 
-  # Otherwise just show executable targets.
-  if spec.get('type', '') == 'executable' and \
-     spec.get('product_extension', '') != 'bundle':
+  # Otherwise just show executable targets and xc_tests.
+  if (int(spec.get('mac_xctest_bundle', 0)) != 0 or
+      (spec.get('type', '') == 'executable' and
+       spec.get('product_extension', '') != 'bundle')):
 
     # If there is a filter and the target does not match, exclude the target.
     if executable_target_pattern is not None:
       if not re.search(executable_target_pattern, target_name):
         return False
     return True
   return False
 
 def CreateWrapper(target_list, target_dicts, data, params):
   """Initialize targets for the ninja wrapper.
@@ skipping 107 matching lines @@
   new_data[sources_gyp] = {}
   new_data[sources_gyp]['targets'] = []
   new_data[sources_gyp]['included_files'] = []
   new_data[sources_gyp]['xcode_settings'] = \
       data[orig_gyp].get('xcode_settings', {})
   new_data[sources_gyp]['targets'].append(new_data_target)
 
   # Write workspace to file.
   _WriteWorkspace(main_gyp, sources_gyp, params)
   return (new_target_list, new_target_dicts, new_data)