Skip to content

Allow %target-run-simple-swift to optionally take arbitrary driver args #20676

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 1 commit into from
Nov 19, 2018
Merged

Allow %target-run-simple-swift to optionally take arbitrary driver args #20676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion test/Interpreter/strong_retain_unowned_mispairing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-run-simple-opt-O-swift
// RUN: %target-run-simple-swift(-O)
// REQUIRES: executable_test

// We were crashing here due to not preserving rc identity.
Expand Down
26 changes: 9 additions & 17 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ config.target_runtime = "unknown"
swift_reflection_test_name = 'swift-reflection-test' + config.variant_suffix

def use_interpreter_for_simple_runs():
def make_simple_target_run(gyb=False, stdlib=False, opt=""):
def make_simple_target_run(gyb=False, stdlib=False, parameterized=False):
result = ''
if gyb:
result += ('%empty-directory(%t) && '
Expand All @@ -592,8 +592,8 @@ def use_interpreter_for_simple_runs():
swift_execution_tests_extra_flags))
if stdlib:
result += '-Xfrontend -disable-access-control '
if opt:
result += opt + ' '
if parameterized:
result += ' \\1 '
if gyb:
result += '%t/main.swift'
else:
Expand All @@ -602,9 +602,8 @@ def use_interpreter_for_simple_runs():
config.target_run_stdlib_swiftgyb = make_simple_target_run(gyb=True)
config.target_run_simple_swiftgyb = make_simple_target_run(gyb=True)
config.target_run_stdlib_swift = make_simple_target_run(stdlib=True)
config.target_run_simple_opt_Osize_swift = make_simple_target_run(opt='-Osize')
config.target_run_simple_opt_O_swift = make_simple_target_run(opt='-O')
config.target_run_simple_swift = make_simple_target_run()
config.target_run_simple_swift_parameterized = make_simple_target_run(parameterized=True)
config.available_features.add('interpret')

if run_vendor == 'apple':
Expand Down Expand Up @@ -1081,21 +1080,15 @@ config.substitutions.append(('%sftp-server',


if not getattr(config, 'target_run_simple_swift', None):
config.target_run_simple_swift = (
'%%empty-directory(%%t) && '
'%s %s %%s -o %%t/a.out -module-name main && '
'%s %%t/a.out &&'
'%s %%t/a.out'
% (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
config.target_run_simple_opt_O_swift = (
config.target_run_simple_swift_parameterized = (
'%%empty-directory(%%t) && '
'%s %s -O %%s -o %%t/a.out -module-name main && '
'%s %s %%s \\1 -o %%t/a.out -module-name main && '
'%s %%t/a.out &&'
'%s %%t/a.out'
% (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
config.target_run_simple_opt_Osize_swift = (
config.target_run_simple_swift = (
'%%empty-directory(%%t) && '
'%s %s -Osize %%s -o %%t/a.out -module-name main && '
'%s %s %%s -o %%t/a.out -module-name main && '
'%s %%t/a.out &&'
'%s %%t/a.out'
% (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
Expand Down Expand Up @@ -1189,9 +1182,8 @@ config.substitutions.append(('%target-swift-frontend', config.target_swift_front


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))
config.substitutions.append(('%target-run-simple-swift', config.target_run_simple_swift))
config.substitutions.append(('%target-run-simple-opt-O-swift', config.target_run_simple_opt_O_swift))
config.substitutions.append(('%target-run-simple-opt-Osize-swift', config.target_run_simple_opt_Osize_swift))
config.substitutions.append(('%target-run-stdlib-swiftgyb', config.target_run_stdlib_swiftgyb))
config.substitutions.append(('%target-run-stdlib-swift', config.target_run_stdlib_swift))
config.substitutions.append(('%target-repl-run-simple-swift', subst_target_repl_run_simple_swift))
Expand Down