mirror of
https://github.com/apple/swift.git
synced 2026-10-14 15:51:20 +02:00
Henrik G. Olsson
f0946d8ed5
Extract the path-sanitization core (path normalization, shared argument definitions, replacement loop, and runtime-warning suppression) into a new swift_path_sanitize module so that both PathSanitizingFileCheck and a new PathSanitizingDiff front-end can share it. PathSanitizingDiff sanitizes stdin the same way and then compares the result against a reference file using diff, collapsing the `PathSanitizingFileCheck --dry-run > out; diff out expected` pattern into a single step (exposed as the %PathSanitizingDiff lit substitution). Similar to PathSanitizingFileCheck, PathSanitizingDiff takes input on stdin, a positional file argument (which is the reference file, instead of file to check for CHECK directives), and various sanitize options. Like diff, PathSanitizingDiff tests can be automatically updated to match the current behavior using lit's `--update-tests`, thanks to the accompanying lit plugin. Migrates a swiftify-import test to demonstrate the new form.
61 lines
2.0 KiB
Python
61 lines
2.0 KiB
Python
import argparse
|
|
import shlex
|
|
import sys
|
|
|
|
from swift_path_sanitize import output_path
|
|
from update_pathsanitizing_diff_tests.litplugin import repair_test
|
|
|
|
"""
|
|
Standalone entry point for repairing a PathSanitizingDiff test from the output
|
|
file that PathSanitizingDiff writes into the per-test temporary namespace. This
|
|
mirrors the lit --update-tests behaviour (see
|
|
update_pathsanitizing_diff_tests.litplugin) so that the update logic can be
|
|
exercised outside lit.
|
|
|
|
Given the test file, the reference file, the temporary location (%t), and the
|
|
`split-file` output directory, it locates the `<temp-dir>`-derived output (see
|
|
swift_path_sanitize.output_path), overwrites the reference file with it, and
|
|
propagates the content into the matching slice of the test file.
|
|
|
|
Example usage:
|
|
python3 update-pathsanitizing-diff-tests.py test.swift %t/out.expected \\
|
|
--temp-dir %t --split-file-dir %t
|
|
"""
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(description=__doc__)
|
|
parser.add_argument("test_file", help="The test file to update")
|
|
parser.add_argument("reference", help="The reference file to update")
|
|
parser.add_argument(
|
|
"--temp-dir",
|
|
required=True,
|
|
help="The test's temporary location (%%t) PathSanitizingDiff was given",
|
|
)
|
|
parser.add_argument(
|
|
"--split-file-dir",
|
|
help="Directory the reference file was materialized into by split-file",
|
|
)
|
|
args = parser.parse_args()
|
|
|
|
# Synthesize the `split-file` command that propagate_split_files scans for,
|
|
# so the standalone path shares the lit plugin's propagation logic.
|
|
commands = []
|
|
if args.split_file_dir:
|
|
commands = [
|
|
"split-file %s %s"
|
|
% (shlex.quote(args.test_file), shlex.quote(args.split_file_dir))
|
|
]
|
|
|
|
output = output_path(args.temp_dir, args.reference)
|
|
(err, msg) = repair_test(args.test_file, args.reference, output, commands)
|
|
if err:
|
|
print(err, file=sys.stderr)
|
|
sys.exit(1)
|
|
if msg:
|
|
print(msg)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|