Remove -swift-version 3 lit substitutions

Author: slavapestov

test/lit.cfg

@@ -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, swift3=False, opt=""):
+    def make_simple_target_run(gyb=False, stdlib=False, opt=""):
         result = ''
         if gyb:
             result += ('%empty-directory(%t) && '
@@ -592,22 +592,16 @@ def use_interpreter_for_simple_runs():
                swift_execution_tests_extra_flags))
         if stdlib:
             result += '-Xfrontend -disable-access-control '
-        if swift3:
-            result += '-swift-version 3 '
         if opt:
             result += opt + ' '
         if gyb:
             result += '%t/main.swift'
         else:
             result += '%s'
         return result
-    config.target_run_stdlib_swiftgyb_swift3 = make_simple_target_run(gyb=True, stdlib=True, swift3=True)
-    config.target_run_stdlib_swiftgyb = make_simple_target_run(gyb=True, swift3=True)
-    config.target_run_simple_swiftgyb_swift3 = make_simple_target_run(gyb=True, swift3=True)
+    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_swift3 = make_simple_target_run(stdlib=True, swift3=True)
     config.target_run_stdlib_swift = make_simple_target_run(stdlib=True)
-    config.target_run_simple_swift_swift3 = make_simple_target_run(swift3=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()
@@ -1105,26 +1099,13 @@ if not getattr(config, 'target_run_simple_swift', None):
         '%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_swift3 = (
-        '%%empty-directory(%%t) && '
-        '%s %s %%s -o %%t/a.out -module-name main -swift-version 3 && '
-        '%s %%t/a.out &&'
-        '%s %%t/a.out'
-        % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
     config.target_run_stdlib_swift = (
         '%%empty-directory(%%t) && '
         '%s %s %%s -o %%t/a.out -module-name main '
         '-Xfrontend -disable-access-control && '
         '%s %%t/a.out &&'
         '%s %%t/a.out'
         % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
-    config.target_run_stdlib_swift_swift3 = (
-        '%%empty-directory(%%t) && '
-        '%s %s %%s -o %%t/a.out -module-name main '
-        '-Xfrontend -disable-access-control -swift-version 3 && '
-        '%s %%t/a.out &&'
-        '%s %%t/a.out'
-        % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
     config.target_run_simple_swiftgyb = (
         '%%empty-directory(%%t) && '
         '%%gyb %%s -o %%t/main.swift && '
@@ -1134,15 +1115,6 @@ if not getattr(config, 'target_run_simple_swift', None):
         '%%line-directive %%t/main.swift -- '
         '%s %%t/a.out'
         % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
-    config.target_run_simple_swiftgyb_swift3 = (
-        '%%empty-directory(%%t) && '
-        '%%gyb %%s -o %%t/main.swift && '
-        '%%line-directive %%t/main.swift -- '
-        '%s %s %%t/main.swift -o %%t/a.out -module-name main -swift-version 3 && '
-        '%s %%t/a.out &&'
-        '%%line-directive %%t/main.swift -- '
-        '%s %%t/a.out'
-        % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
     config.target_run_stdlib_swiftgyb = (
         '%%empty-directory(%%t) && '
         '%%gyb %%s -o %%t/main.swift && '
@@ -1153,16 +1125,6 @@ if not getattr(config, 'target_run_simple_swift', None):
         '%%line-directive %%t/main.swift -- '
         '%s %%t/a.out'
         % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
-    config.target_run_stdlib_swiftgyb_swift3 = (
-        '%%empty-directory(%%t) && '
-        '%%gyb %%s -o %%t/main.swift && '
-        '%%line-directive %%t/main.swift -- '
-        '%s %s %%t/main.swift -o %%t/a.out -module-name main -swift-version 3 '
-        '-Xfrontend -disable-access-control && '
-        '%s %%t/a.out &&'
-        '%%line-directive %%t/main.swift -- '
-        '%s %%t/a.out'
-        % (config.target_build_swift, mcp_opt, config.target_codesign, config.target_run))
 
 subst_target_jit_run = ""
 if 'swift_interpreter' in config.available_features:
@@ -1224,15 +1186,11 @@ config.substitutions.append(
 config.substitutions.append(('%target-swift-frontend', config.target_swift_frontend))
 
 
-config.substitutions.append(('%target-run-simple-swiftgyb-swift3', config.target_run_simple_swiftgyb_swift3))
 config.substitutions.append(('%target-run-simple-swiftgyb', config.target_run_simple_swiftgyb))
-config.substitutions.append(('%target-run-simple-swift-swift3', config.target_run_simple_swift_swift3))
 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-swift3', config.target_run_stdlib_swiftgyb_swift3))
 config.substitutions.append(('%target-run-stdlib-swiftgyb', config.target_run_stdlib_swiftgyb))
-config.substitutions.append(('%target-run-stdlib-swift-swift3', config.target_run_stdlib_swift_swift3))
 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))
 config.substitutions.append(('%target-run', config.target_run))