[swift-3.0-branch] Tests: make FileCheck a substitution that sanitizes the input #4228
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
'%FileCheck' removes absolute paths of the source and build directory from the input. Overwhelming majority of tests don't intend to match these paths. Also add a substitution '%raw-FileCheck' that does not sanitize the input.
This reverts commit 02039a1. With the new `%FileCheck` substitution that removess full paths to the build directory from FileCheck inputs, this workaround is no longer needed.
Contributor
Author
|
Tests pass locally on macOS. Trying CI. |
Contributor
Author
|
@swift-ci Please test |
1 similar comment
Contributor
Author
|
@swift-ci Please test |
Contributor
Author
|
Linux tests failed because of unrelated reasons, macOS tests passed. |
kateinoigakukun
pushed a commit
that referenced
this pull request
Aug 31, 2022
[pull] swiftwasm from main
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.
This is a cherry-pick of #4187.
Normally I would not propose such a massive change for the branch, but I think that not including this particular change in the branch will make cherry-picking fixes harder. If we don't cherry-pick this change, the
masterbranch prohibits usingFileCheckin RUN lines, whileswift-3.0-branchdoes not allow using%FileCheck. I don't think that would be a very good state to be in.Original description
In the Swift testsuite, FileCheck is used to check for (or for absence of) fixed strings in the input. It is not an issue when the string is long and complex (e.g., a full SIL instruction). But sometimes the string is a common word (e.g., 'sdk' or 'branch'). Tests that use such patterns are known break when the path to the build directory contains these words.
This change makes
%FileChecka lit substitution that replaces paths to source and build directories with fixed strings.