[test] NFC: Factor out %xcode-extra-platform-search-paths

Author: hamishknight

test/lit.cfg

@@ -1323,6 +1323,7 @@ if run_vendor == 'apple':
                                      "Developer", "Library", "Frameworks")
     extra_platform_swift_modules = make_path(config.variant_sdk, "..", "..", "..",
                                              "Developer", "usr", "lib")
+    extra_platform_search_paths = '-F %r -I %r' % (extra_frameworks_dir, extra_platform_swift_modules)
 
     target_options = (
         "-target %s %s %s" %
@@ -2808,9 +2809,9 @@ config.substitutions.insert(0, ('%test-resource-dir', test_resource_dir))
 
 if run_vendor != 'apple':
     extra_frameworks_dir = ''
-    extra_platform_swift_modules = ''
+    extra_platform_search_paths = ''
 config.substitutions.append(('%xcode-extra-frameworks-dir', extra_frameworks_dir))
-config.substitutions.append(('%xcode-extra-platform-swift-modules', extra_platform_swift_modules))
+config.substitutions.append(('%xcode-extra-platform-search-paths', extra_platform_search_paths))
 
 config.substitutions.append(('%target-swiftmodule-name', target_specific_module_triple + '.swiftmodule'))
 config.substitutions.append(('%target-swiftdoc-name', target_specific_module_triple + '.swiftdoc'))

validation-test/IDE/complete_sdk_platform.swift

@@ -1,10 +1,10 @@
 // RUN: %empty-directory(%t)
 // RUN: ln -s %sdk %t/sdk
 
-// RUN: %batch-code-completion -F %xcode-extra-frameworks-dir -I %xcode-extra-platform-swift-modules
+// RUN: %batch-code-completion %xcode-extra-platform-search-paths
 
 // Works if SDK is specified as a symlink too.
-// RUN: %batch-code-completion -sdk %t/sdk -F %xcode-extra-frameworks-dir -I %xcode-extra-platform-swift-modules
+// RUN: %batch-code-completion -sdk %t/sdk %xcode-extra-platform-search-paths
 
 // REQUIRES: VENDOR=apple