@@ -2318,17 +2318,16 @@ if not getattr(config, 'target_run_simple_swift', None):
23182318 escape_for_substitute_captures (config .target_codesign ),
23192319 escape_for_substitute_captures (config .target_run ))
23202320 )
2321- if not kIsWindows :
2322- config .target_run_simple_leaks_swift_parameterized = SubstituteCaptures (
2323- r"%%empty-directory(%%t) && "
2324- r"%s %s %%s \1 -o %%t/a.out -module-name main && "
2325- r"%s %%t/a.out && "
2326- r"%s %%t/a.out"
2327- % (escape_for_substitute_captures (config .target_build_swift ),
2328- escape_for_substitute_captures (mcp_opt ),
2329- escape_for_substitute_captures (config .target_codesign ),
2330- escape_for_substitute_captures (config .target_run_with_leaks ))
2331- )
2321+ config .target_run_simple_leaks_swift_parameterized = SubstituteCaptures (
2322+ r"%%empty-directory(%%t) && "
2323+ r"%s %s %%s \1 -o %%t/a.out -module-name main && "
2324+ r"%s %%t/a.out && "
2325+ r"%s %%t/a.out"
2326+ % (escape_for_substitute_captures (config .target_build_swift ),
2327+ escape_for_substitute_captures (mcp_opt ),
2328+ escape_for_substitute_captures (config .target_codesign ),
2329+ escape_for_substitute_captures (config .target_run_with_leaks ))
2330+ )
23322331 config .target_fail_simple_swift_parameterized = SubstituteCaptures (
23332332 r"%%empty-directory(%%t) && "
23342333 r"%s %s %%s \1 -o %%t/a.out -module-name main && "
@@ -2504,9 +2503,8 @@ config.substitutions.append(('%target-run-simple-swiftgyb\(([^)]+)\)',
25042503config .substitutions .append (('%target-run-simple-swiftgyb' , config .target_run_simple_swiftgyb ))
25052504config .substitutions .append (('%target-run-simple-swift\(([^)]+)\)' ,
25062505 config .target_run_simple_swift_parameterized ))
2507- if not kIsWindows :
2508- config .substitutions .append (('%target-run-simple-leaks-swift\(([^)]+)\)' ,
2509- config .target_run_simple_leaks_swift_parameterized ))
2506+ config .substitutions .append (('%target-run-simple-leaks-swift\(([^)]+)\)' ,
2507+ config .target_run_simple_leaks_swift_parameterized ))
25102508config .substitutions .append (('%target-fail-simple-swift\(([^)]+)\)' ,
25112509 config .target_fail_simple_swift_parameterized ))
25122510config .substitutions .append (('%target-run-stdlib-swift\(([^)]+)\)' ,
0 commit comments