[Test] Add %host_triple and %host_sdk substitutions #64796
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift Please smoke test |
rintaro
changed the title
bnbarham
reviewed
Mar 31, 2023
test/Macros/composed_macro.swift
Outdated
| // RUN: %target-build-swift -swift-version 5 -I %swift-host-lib-dir -L %swift-host-lib-dir -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath | ||
| // RUN: %swiftc_driver -sdk %host_sdk -target %host_triple -swift-version 5 -I %swift-host-lib-dir -L %swift-host-lib-dir -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath |
There was a problem hiding this comment.
Could we have a host-build-swift to match target-build-swift?
test/lit.cfg
Outdated
| @@ -963,7 +963,7 @@ def use_interpreter_for_simple_runs(): | |||
| result += ( | |||
| 'env SWIFT_INTERPRETER=%r %s %r %s -module-name main %s %s %s ' | |||
| % (config.swift, xcrun_prefix, config.swift, target_options, | |||
| config.swift_test_options, | |||
| onfig.swift_test_options, | |||
rintaro
force-pushed
the
test-hosttriple-rdar107398734
branch
2 times, most recently
from
4f9e6f4 to
1828fc6
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test macOS |
|
@swift-ci Please smoke test |
Macro tests need to build host libraries/tools. We can't use %target-* substitutions for that. rdar://107398734
rintaro
force-pushed
the
test-hosttriple-rdar107398734
branch
from
1828fc6 to
1d2fd42
Compare
|
@swift-ci Please smoke test |
bnbarham
approved these changes
Mar 31, 2023
| @@ -1,5 +1,5 @@ | |||
| // RUN: %empty-directory(%t) | |||
| // RUN: %target-build-swift -swift-version 5 -I %swift-host-lib-dir -L %swift-host-lib-dir -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath | |||
| // RUN: %host-build-swift -swift-version 5 -I %swift-host-lib-dir -L %swift-host-lib-dir -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath | |||
There was a problem hiding this comment.
Any thoughts on including -I %swift-host-lib-dir -L %swift-host-lib-dir by default for host-build-swift? Or we could have %host-tool-build-swift or something 😅. What you have now is fine though, I can do that when I go through and fix up all the REQUIRES if we can think of a nice name for it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Macro tests need to build host libraries/tools. We can't use
%target-*substitutions for that.rdar://107398734