Merge pull request swiftlang#21535 from compnerd/capture-the-moment

lit: substitute back references on Windows

Author: compnerd

test/lit.cfg

@@ -1150,12 +1150,13 @@ config.substitutions.append(('%sftp-server',
 
 
 if not getattr(config, 'target_run_simple_swift', None):
-    config.target_run_simple_swift_parameterized = (
-        '%%empty-directory(%%t) && '
-        '%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_swift_parameterized =                               \
+        (SubstituteCaptures('%%empty-directory(%%t) && '
+                            '%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_swift = (
         '%%empty-directory(%%t) && '
         '%s %s %%s -o %%t/a.out -module-name main && '
@@ -1277,7 +1278,7 @@ if hasattr(config, 'target_cc_options'):
 
 config.substitutions.append(
     (r'%hardlink-or-copy\(from: *(.*), *to: *(.*)\)',
-     r'ln \1 \2 || cp \1 \2'))
+     SubstituteCaptures(r'ln \1 \2 || cp \1 \2')))
 
 config.substitutions.append(('%utils', config.swift_utils))
 config.substitutions.append(('%line-directive', '%r %s' % (sys.executable, config.line_directive)))