test: use llvm-strings instead of strings #19767
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
|
CC: @vedantk @jrose-apple |
|
@swift-ci please test |
|
LGTM, thanks. |
|
@vedantk @compnerd I think you need to make this a cmake dependency as well. Here: https://github.com/apple/swift/blob/25c02ced293e50bd109a347db8fd3fdd5df8877d/test/CMakeLists.txt#L49 |
|
We are generally doing that for all tools that we rely on for our lit testing. |
We should have the LLVM build which provides most of the tools that we need. `strings` is amongst them. Add a new `llvm-strings` substitution from lit and use that instead of `strings`. This helps with Windows which does not have a `strings` tool.
|
@swift-ci please test and merge |
|
@swift-ci please test macOS platform |
jrose-apple
reviewed
Oct 22, 2018
| @@ -374,6 +375,7 @@ config.substitutions.append( ('%llvm-dis', config.llvm_dis) ) | |||
| config.substitutions.append( ('%swift-demangle-yamldump', config.swift_demangle_yamldump) ) | |||
| config.substitutions.append( ('%Benchmark_O', config.benchmark_o) ) | |||
| config.substitutions.append( ('%Benchmark_Driver', config.benchmark_driver) ) | |||
| config.substitutions.append( ('%llvm-strings', config.llvm_strings) ) | |||
There was a problem hiding this comment.
Nitpick: Please don't add a substitution for this. The LLVM tools are already in the search path, so you can just say llvm-strings. (We rely on this already for things like not.)
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.
We should have the LLVM build which provides most of the tools that we need.
stringsis amongst them. Add a newllvm-stringssubstitution from lit anduse that instead of
strings. This helps with Windows which does not have astringstool.Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.