Skip to content

Commit 641d9b1

Browse files
committed
[lit] Add %target-run-stdlib-swiftgyb
1 parent 87685aa commit 641d9b1

File tree

1 file changed

+28
-4
lines changed

1 file changed

+28
-4
lines changed

test/lit.cfg

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -694,15 +694,22 @@ if run_vendor == 'apple':
694694
config.swift_test_options,
695695
config.swift_driver_test_options,
696696
swift_execution_tests_extra_flags))
697+
target_run_stdlib = (
698+
'%s -Xfrontend -disable-access-control' % (target_run_base))
697699
config.target_run_simple_swift = (
698700
"%s %%s" % (target_run_base))
699-
config.target_run_stdlib_swift = (
700-
"%s -Xfrontend -disable-access-control %%s" % (target_run_base))
701701
config.target_run_simple_swiftgyb = (
702702
'rm -rf %%t && mkdir -p %%t && '
703703
'%%gyb %%s -o %%t/main.swift && '
704704
'%%line-directive %%t/main.swift -- %s %%t/main.swift'
705705
% (target_run_base))
706+
config.target_run_stdlib_swift = (
707+
"%s %%s" % (target_run_stdlib))
708+
config.target_run_stdlib_swiftgyb = (
709+
'rm -rf %%t && mkdir -p %%t && '
710+
'%%gyb %%s -o %%t/main.swift && '
711+
'%%line-directive %%t/main.swift -- %s %%t/main.swift'
712+
% (target_run_stdlib))
706713
config.available_features.add('interpret')
707714
config.environment['SWIFT_INTERPRETER'] = config.swift
708715

@@ -804,15 +811,22 @@ elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'wi
804811
mcp_opt, config.swift_test_options,
805812
config.swift_driver_test_options,
806813
swift_execution_tests_extra_flags))
814+
target_run_stdlib = (
815+
'%s -Xfrontend -disable-access-control' % (target_run_base))
807816
config.target_run_simple_swift = (
808817
'%s %%s' % (target_run_base))
809-
config.target_run_stdlib_swift = (
810-
'%s -Xfrontend -disable-access-control %%s' % (target_run_base))
811818
config.target_run_simple_swiftgyb = (
812819
'rm -rf %%t && mkdir -p %%t && '
813820
'%%gyb %%s -o %%t/main.swift && '
814821
'%%line-directive %%t/main.swift -- %s %%t/main.swift'
815822
% (target_run_base))
823+
config.target_run_stdlib_swift = (
824+
'%s %%s' % (target_run_stdlib))
825+
config.target_run_stdlib_swiftgyb = (
826+
'rm -rf %%t && mkdir -p %%t && '
827+
'%%gyb %%s -o %%t/main.swift && '
828+
'%%line-directive %%t/main.swift -- %s %%t/main.swift'
829+
% (target_run_stdlib))
816830
config.available_features.add('interpret')
817831
config.environment['SWIFT_INTERPRETER'] = config.swift
818832
config.target_sil_opt = (
@@ -985,6 +999,15 @@ if not getattr(config, 'target_run_simple_swift', None):
985999
'%%line-directive %%t/main.swift -- '
9861000
'%s %%t/a.out'
9871001
% (config.target_build_swift, mcp_opt, config.target_run))
1002+
config.target_run_stdlib_swiftgyb = (
1003+
'rm -rf %%t && mkdir -p %%t && '
1004+
'%%gyb %%s -o %%t/main.swift && '
1005+
'%%line-directive %%t/main.swift -- '
1006+
'%s %s %%t/main.swift -o %%t/a.out -module-name main '
1007+
'-Xfrontend -disable-access-control && '
1008+
'%%line-directive %%t/main.swift -- '
1009+
'%s %%t/a.out'
1010+
% (config.target_build_swift, mcp_opt, config.target_run))
9881011

9891012
subst_target_jit_run = ""
9901013
if 'swift_interpreter' in config.available_features:
@@ -1042,6 +1065,7 @@ config.substitutions.append(('%target-swift-frontend', config.target_swift_front
10421065

10431066
config.substitutions.append(('%target-run-simple-swiftgyb', config.target_run_simple_swiftgyb))
10441067
config.substitutions.append(('%target-run-simple-swift', config.target_run_simple_swift))
1068+
config.substitutions.append(('%target-run-stdlib-swiftgyb', config.target_run_stdlib_swiftgyb))
10451069
config.substitutions.append(('%target-run-stdlib-swift', config.target_run_stdlib_swift))
10461070
config.substitutions.append(('%target-repl-run-simple-swift', subst_target_repl_run_simple_swift))
10471071
config.substitutions.append(('%target-run', config.target_run))

0 commit comments

Comments
 (0)