averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[test] Handle more configurations when building testing overlays.

Browse Source 
In particular, handle builds where the /real/ overlays are built separately and found
via ordinary -I. This isn't a configuration we ship with, but it is used for building
and testing.

rdar://problem/25609408
This commit is contained in:
Jordan Rose
2016-04-08 12:02:11 -07:00
parent 945c2fb979
commit 6d5120be69
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/SILGen/lit.local.cfg
View File

@@ -2,5 +2,5 @@
config.substitutions = list(config.substitutions) config.substitutions = list(config.substitutions)
config.substitutions.insert(0, ('%build-silgen-test-overlays', config.substitutions.insert(0, ('%build-silgen-test-overlays',
'%target-swift-frontend -emit-module -o %t -sdk %S/Inputs %S/Inputs/ObjectiveC.swift && ' '%target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/ObjectiveC.swift && '
'%target-swift-frontend -emit-module -o %t -sdk %S/Inputs %S/Inputs/Foundation.swift -I %t')) '%target-swift-frontend(mock-sdk: -sdk %S/Inputs -I %t) -emit-module -o %t %S/Inputs/Foundation.swift'))

6
test/lit.cfg
View File

@@ -349,9 +349,9 @@ config.substitutions.append( ('%clang-include-dir', config.clang_include_dir) )
# Use this to build the basic set of Objective-C overlays. # Use this to build the basic set of Objective-C overlays.
config.substitutions.append( config.substitutions.append(
('%build-clang-importer-objc-overlays', ('%build-clang-importer-objc-overlays',
'%target-swift-frontend -emit-module -o %t -sdk %clang-importer-sdk-path %clang-importer-sdk-path/swift-modules/ObjectiveC.swift && ' '%target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -o %t %clang-importer-sdk-path/swift-modules/ObjectiveC.swift && '
'%target-swift-frontend -emit-module -o %t -sdk %clang-importer-sdk-path %clang-importer-sdk-path/swift-modules/CoreGraphics.swift -I %t && ' '%target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -o %t %clang-importer-sdk-path/swift-modules/CoreGraphics.swift && '
'%target-swift-frontend -emit-module -o %t -sdk %clang-importer-sdk-path %clang-importer-sdk-path/swift-modules/Foundation.swift -I %t')) '%target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -o %t %clang-importer-sdk-path/swift-modules/Foundation.swift'))
# FIXME: BEGIN -enable-source-import hackaround # FIXME: BEGIN -enable-source-import hackaround
config.substitutions.append( config.substitutions.append(