Skip to content

Commit 4e8ae19

Browse files
authored
Merge pull request #16263 from compnerd/empty-directory
2 parents 1283b54 + 6bc11fd commit 4e8ae19

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

test/lit.cfg

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -694,14 +694,14 @@ if run_vendor == 'apple':
694694
config.target_run_simple_swift = (
695695
"%s %%s" % (target_run_base))
696696
config.target_run_simple_swiftgyb = (
697-
'rm -rf %%t && mkdir -p %%t && '
697+
'%%empty-directory(%%t) && '
698698
'%%gyb %%s -o %%t/main.swift && '
699699
'%%line-directive %%t/main.swift -- %s %%t/main.swift'
700700
% (target_run_base))
701701
config.target_run_stdlib_swift = (
702702
"%s %%s" % (target_run_stdlib))
703703
config.target_run_stdlib_swiftgyb = (
704-
'rm -rf %%t && mkdir -p %%t && '
704+
'%%empty-directory(%%t) && '
705705
'%%gyb %%s -o %%t/main.swift && '
706706
'%%line-directive %%t/main.swift -- %s %%t/main.swift'
707707
% (target_run_stdlib))
@@ -811,14 +811,14 @@ elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'wi
811811
config.target_run_simple_swift = (
812812
'%s %%s' % (target_run_base))
813813
config.target_run_simple_swiftgyb = (
814-
'rm -rf %%t && mkdir -p %%t && '
814+
'%%empty-directory(%%t) && '
815815
'%%gyb %%s -o %%t/main.swift && '
816816
'%%line-directive %%t/main.swift -- %s %%t/main.swift'
817817
% (target_run_base))
818818
config.target_run_stdlib_swift = (
819819
'%s %%s' % (target_run_stdlib))
820820
config.target_run_stdlib_swiftgyb = (
821-
'rm -rf %%t && mkdir -p %%t && '
821+
'%%empty-directory(%%t) && '
822822
'%%gyb %%s -o %%t/main.swift && '
823823
'%%line-directive %%t/main.swift -- %s %%t/main.swift'
824824
% (target_run_stdlib))
@@ -967,26 +967,26 @@ check_runtime_libs(runtime_libs)
967967

968968
if not getattr(config, 'target_run_simple_swift', None):
969969
config.target_run_simple_swift = (
970-
'rm -rf %%t && mkdir -p %%t && '
970+
'%%empty-directory(%%t) && '
971971
'%s %s %%s -o %%t/a.out -module-name main && '
972972
'%s %%t/a.out'
973973
% (config.target_build_swift, mcp_opt, config.target_run))
974974
config.target_run_stdlib_swift = (
975-
'rm -rf %%t && mkdir -p %%t && '
975+
'%%empty-directory(%%t) && '
976976
'%s %s %%s -o %%t/a.out -module-name main '
977977
'-Xfrontend -disable-access-control && '
978978
'%s %%t/a.out'
979979
% (config.target_build_swift, mcp_opt, config.target_run))
980980
config.target_run_simple_swiftgyb = (
981-
'rm -rf %%t && mkdir -p %%t && '
981+
'%%empty-directory(%%t) && '
982982
'%%gyb %%s -o %%t/main.swift && '
983983
'%%line-directive %%t/main.swift -- '
984984
'%s %s %%t/main.swift -o %%t/a.out -module-name main && '
985985
'%%line-directive %%t/main.swift -- '
986986
'%s %%t/a.out'
987987
% (config.target_build_swift, mcp_opt, config.target_run))
988988
config.target_run_stdlib_swiftgyb = (
989-
'rm -rf %%t && mkdir -p %%t && '
989+
'%%empty-directory(%%t) && '
990990
'%%gyb %%s -o %%t/main.swift && '
991991
'%%line-directive %%t/main.swift -- '
992992
'%s %s %%t/main.swift -o %%t/a.out -module-name main '

0 commit comments

Comments
 (0)