[Utils] Sanitize %t with PathSanitizingFileCheck #84843
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| // RUN: %empty-directory(%t.module-cache) | ||
| // RUN: %empty-directory(%t.scanner-cache) | ||
|
|
||
| // RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t.module-cache -clang-scanner-module-cache-path %t.scanner-cache %s -o %t.deps.json -I %S/Inputs/SwiftDifferent -dump-clang-diagnostics 2>&1 | %FileCheck %s --check-prefix=CHECK-CLANG-COMMAND --enable-yaml-compatibility | ||
| // RUN: %validate-json %t.deps.json | %FileCheck %s --check-prefix=CHECK-DEPS --enable-yaml-compatibility | ||
|
|
||
| // Ensure we prefer clang scanner module cache path | ||
| // CHECK-CLANG-COMMAND: '-fmodules-cache-path={{.*}}.scanner-cache' | ||
|
|
||
| // Ensure we the modules' output path is set to the module cache | ||
| // CHECK-DEPS: "swift": "A" | ||
| // CHECK-DEPS: "swift": "A" | ||
| // CHECK-DEPS: "modulePath": "TMP_DIR.module-cache{{/|\\\\}}A-{{.*}}.swiftmodule" | ||
|
|
||
| import A |
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,10 +11,26 @@ | |
|
|
||
| import argparse | ||
| import io | ||
| import os | ||
| import platform | ||
| import re | ||
| import subprocess | ||
| import sys | ||
|
|
||
| # LLVM Lit performs realpath with the config path, so all paths are relative | ||
| # to the real path. Paths that come from CMake (like cmake_binary_dir and | ||
| # swift_src_root), might not do real path. Use realpath to normalize. Because | ||
| # this normalizes Windows paths to use backslashes, we have to replace them | ||
| # back to forward slashes. | ||
| def normalize_if_path(s): | ||
| # Check dirname for cases like a file named `%t.out.txt` | ||
| # There won't be a `%t` path, but we still want to match this path substring. | ||
| if not os.path.exists(s) and not os.path.exists(os.path.dirname(s)): | ||
| return s | ||
| if platform.system() == "Windows": | ||
| return os.path.abspath(s).replace('\\', '/') | ||
| else: | ||
| return os.path.realpath(s) | ||
|
|
||
| def main(): | ||
| parser = argparse.ArgumentParser( | ||
|
|
@@ -78,13 +94,13 @@ constants.""") | |
|
|
||
| stdin = io.open(sys.stdin.fileno(), 'r', encoding='utf-8', errors='ignore').read() | ||
|
|
||
| for s in sorted(args.sanitize_strings, key=len, reverse=True): | ||
| replacement, pattern = s.split('=', 1) | ||
| # Since we want to use pattern as a regex in some platforms, we need | ||
| # to escape it first, and then replace the escaped slash | ||
| # literal (r'\\/') for our platform-dependent slash regex. | ||
| stdin = re.sub(re.sub(r'\\/' if sys.version_info[0] < 3 else r'/', | ||
| slashes_re, re.escape(normalize_if_path(pattern))), | ||
|
Member
Author
There was a problem hiding this comment. @compnerd This is the call to
Member
There was a problem hiding this comment. Right, but I don't see the call to the function inside the implementation of
Member
Author
There was a problem hiding this comment. Ah I see. It basically does the same thing, with some extra on top. Here's what the implementation of |
||
| replacement, stdin) | ||
|
|
||
| # Because we force the backtracer on in the tests, we can get runtime | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bnbarham Turns out this matcher doesn't actually match a file name, just a substring in the expansion of the
%tpath. There are other matchers in this file that do still match a file name like intended, so I'm not sure if this is just a mistake in the test, or indicative of a regression.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably more of a @nkcsgexi, but this seems fine as the test is written - we're not building
SDKDependencies.swifthere so it makes sense it's not in the dependencies. Though I'm unclear if it was meant to be buildingSDKDependencies.swifthere or not (ie.%srather than-in the run line above)