Skip to content

Revert adding "leaks" based lit run key #66254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 1, 2023
Merged

Revert adding "leaks" based lit run key #66254

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e55a731
Revert "fix lit config on windows"
ktoso May 31, 2023
401e930
Revert "[lit] introduce target-run-simple-leaks-swift to run with `le…
ktoso May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 1 addition & 21 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,7 @@ else:
swift_reflection_test_name = 'swift-reflection-test' + variant_suffix

def use_interpreter_for_simple_runs():
def make_simple_target_run(gyb=False, stdlib=False, parameterized=False, leaks=False):
def make_simple_target_run(gyb=False, stdlib=False, parameterized=False):
result = ''
if gyb:
result += ('%empty-directory(%t) && '
Expand Down Expand Up @@ -1038,7 +1038,6 @@ def use_interpreter_for_simple_runs():
config.target_run_stdlib_swift = make_simple_target_run(stdlib=True)
config.target_run_simple_swift = make_simple_target_run()
config.target_run_simple_swift_parameterized = make_simple_target_run(parameterized=True)
config.target_run_simple_leaks_swift_parameterized = make_simple_leaks_target_run(parameterized=True)
config.target_run_stdlib_swift_parameterized = make_simple_target_run(stdlib=True, parameterized=True)
config.target_run_simple_swiftgyb_parameterized = make_simple_target_run(gyb=True, parameterized=True)
config.available_features.add('interpret')
Expand Down Expand Up @@ -2278,11 +2277,6 @@ elif not kIsWindows:
lit_config.note('Testing with the just-built libraries')

lit_config.note('Library load path: {0}'.format(os.path.pathsep.join(target_stdlib_path)))
config.target_run_with_leaks = (
"/usr/bin/env " +
construct_library_path_env(target_stdlib_path) +
" xcrun leaks -atExit -- " +
config.target_run)
config.target_run = (
"/usr/bin/env " +
construct_library_path_env(target_stdlib_path) +
Expand Down Expand Up @@ -2318,17 +2312,6 @@ if not getattr(config, 'target_run_simple_swift', None):
escape_for_substitute_captures(config.target_codesign),
escape_for_substitute_captures(config.target_run))
)
if not kIsWindows:
config.target_run_simple_leaks_swift_parameterized = SubstituteCaptures(
r"%%empty-directory(%%t) && "
r"%s %s %%s \1 -o %%t/a.out -module-name main && "
r"%s %%t/a.out && "
r"%s %%t/a.out"
% (escape_for_substitute_captures(config.target_build_swift),
escape_for_substitute_captures(mcp_opt),
escape_for_substitute_captures(config.target_codesign),
escape_for_substitute_captures(config.target_run_with_leaks))
)
config.target_fail_simple_swift_parameterized = SubstituteCaptures(
r"%%empty-directory(%%t) && "
r"%s %s %%s \1 -o %%t/a.out -module-name main && "
Expand Down Expand Up @@ -2504,9 +2487,6 @@ config.substitutions.append(('%target-run-simple-swiftgyb\(([^)]+)\)',
config.substitutions.append(('%target-run-simple-swiftgyb', config.target_run_simple_swiftgyb))
config.substitutions.append(('%target-run-simple-swift\(([^)]+)\)',
config.target_run_simple_swift_parameterized))
if not kIsWindows:
config.substitutions.append(('%target-run-simple-leaks-swift\(([^)]+)\)',
config.target_run_simple_leaks_swift_parameterized))
config.substitutions.append(('%target-fail-simple-swift\(([^)]+)\)',
config.target_fail_simple_swift_parameterized))
config.substitutions.append(('%target-run-stdlib-swift\(([^)]+)\)',
Expand Down