Index: pylib/gyp/generator/xcode.py |
diff --git a/pylib/gyp/generator/xcode.py b/pylib/gyp/generator/xcode.py |
index 0e3fb9301ecb9e6a6a4700ad063ae9742ab0181f..db99d6ab81ed5c340ba13bcb9a6c2393fcadd6c0 100644 |
--- a/pylib/gyp/generator/xcode.py |
+++ b/pylib/gyp/generator/xcode.py |
@@ -77,6 +77,7 @@ generator_additional_non_configuration_keys = [ |
'mac_framework_headers', |
'mac_framework_private_headers', |
'mac_xctest_bundle', |
+ 'mac_xcuitest_bundle', |
'xcode_create_dependents_test_runner', |
] |
@@ -691,6 +692,7 @@ def GenerateOutput(target_list, target_dicts, data, params): |
'executable+bundle': 'com.apple.product-type.application', |
'loadable_module+bundle': 'com.apple.product-type.bundle', |
'loadable_module+xctest': 'com.apple.product-type.bundle.unit-test', |
+ 'loadable_module+xcuitest': 'com.apple.product-type.bundle.ui-testing', |
'shared_library+bundle': 'com.apple.product-type.framework', |
'executable+extension+bundle': 'com.apple.product-type.app-extension', |
'executable+watch+extension+bundle': |
@@ -707,13 +709,19 @@ def GenerateOutput(target_list, target_dicts, data, params): |
type = spec['type'] |
is_xctest = int(spec.get('mac_xctest_bundle', 0)) |
+ is_xcuitest = int(spec.get('mac_xcuitest_bundle', 0)) |
is_bundle = int(spec.get('mac_bundle', 0)) or is_xctest |
is_app_extension = int(spec.get('ios_app_extension', 0)) |
is_watchkit_extension = int(spec.get('ios_watchkit_extension', 0)) |
is_watch_app = int(spec.get('ios_watch_app', 0)) |
if type != 'none': |
type_bundle_key = type |
- if is_xctest: |
+ if is_xcuitest: |
+ type_bundle_key += '+xcuitest' |
+ assert type == 'loadable_module', ( |
+ 'mac_xcuitest_bundle targets must have type loadable_module ' |
+ '(target %s)' % target_name) |
+ elif is_xctest: |
type_bundle_key += '+xctest' |
assert type == 'loadable_module', ( |
'mac_xctest_bundle targets must have type loadable_module ' |
@@ -745,6 +753,9 @@ def GenerateOutput(target_list, target_dicts, data, params): |
assert not is_bundle, ( |
'mac_bundle targets cannot have type none (target "%s")' % |
target_name) |
+ assert not is_xcuitest, ( |
+ 'mac_xcuitest_bundle targets cannot have type none (target "%s")' % |
+ target_name) |
assert not is_xctest, ( |
'mac_xctest_bundle targets cannot have type none (target "%s")' % |
target_name) |