[test] Fix up --param interpret mode

It's still not working very well (23 failing tests, 1 UXPASS), but at
least I can run it again. We probably need a bot.

Author: jrose-apple

test/lit.cfg

@@ -573,6 +573,44 @@ 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=""):
+        result = ''
+        if gyb:
+            result += ('%empty-directory(%t) && '
+                       '%gyb %s -o %t/main.swift && '
+                       '%line-directive %t/main.swift -- ')
+        # FIXME: SWIFT_INTERPRETER needs to be a set of arguments, not just a
+        # path.
+        result += (
+            'env SWIFT_INTERPRETER=%r %s %r %s -module-name main %s %s %s '
+            % (config.swift, xcrun_prefix, config.swift, target_options,
+               config.swift_test_options,
+               config.swift_driver_test_options,
+               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_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()
+    config.available_features.add('interpret')
+
 if run_vendor == 'apple':
     config.available_features.add('objc_interop')
     config.target_swiftmodule_name = run_cpu + ".swiftmodule"
@@ -702,30 +740,7 @@ if run_vendor == 'apple':
         config.target_run = ""
 
         if 'interpret' in lit_config.params:
-            target_run_base = (
-                '%s %s %s -module-name main %s %s %s'
-                % (xcrun_prefix, config.swift, target_options,
-                   config.swift_test_options,
-                   config.swift_driver_test_options,
-                   swift_execution_tests_extra_flags))
-            target_run_stdlib = (
-                '%s -Xfrontend -disable-access-control' % (target_run_base))
-            config.target_run_simple_swift = (
-                "%s %%s" % (target_run_base))
-            config.target_run_simple_swiftgyb = (
-                '%%empty-directory(%%t) && '
-                '%%gyb %%s -o %%t/main.swift && '
-                '%%line-directive %%t/main.swift -- %s %%t/main.swift'
-                % (target_run_base))
-            config.target_run_stdlib_swift = (
-                "%s %%s" % (target_run_stdlib))
-            config.target_run_stdlib_swiftgyb = (
-                '%%empty-directory(%%t) && '
-                '%%gyb %%s -o %%t/main.swift && '
-                '%%line-directive %%t/main.swift -- %s %%t/main.swift'
-                % (target_run_stdlib))
-            config.available_features.add('interpret')
-            config.environment['SWIFT_INTERPRETER'] = config.swift
+            use_interpreter_for_simple_runs()
 
         (sw_vers_name, sw_vers_vers, sw_vers_build) = \
             darwin_get_sw_vers()
@@ -819,30 +834,7 @@ elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'wi
     subst_target_swift_frontend_mock_sdk_after = ""
     config.target_run = ''
     if 'interpret' in lit_config.params:
-        target_run_base = (
-            '%s -target %s %s %s -module-name main %s %s %s'
-            % (config.swift, config.variant_triple, resource_dir_opt,
-               mcp_opt, config.swift_test_options,
-               config.swift_driver_test_options,
-               swift_execution_tests_extra_flags))
-        target_run_stdlib = (
-            '%s -Xfrontend -disable-access-control' % (target_run_base))
-        config.target_run_simple_swift = (
-            '%s %%s' % (target_run_base))
-        config.target_run_simple_swiftgyb = (
-            '%%empty-directory(%%t) && '
-            '%%gyb %%s -o %%t/main.swift && '
-            '%%line-directive %%t/main.swift -- %s %%t/main.swift'
-            % (target_run_base))
-        config.target_run_stdlib_swift = (
-            '%s %%s' % (target_run_stdlib))
-        config.target_run_stdlib_swiftgyb = (
-            '%%empty-directory(%%t) && '
-            '%%gyb %%s -o %%t/main.swift && '
-            '%%line-directive %%t/main.swift -- %s %%t/main.swift'
-            % (target_run_stdlib))
-        config.available_features.add('interpret')
-        config.environment['SWIFT_INTERPRETER'] = config.swift
+        use_interpreter_for_simple_runs()
     config.target_sil_opt = (
         '%s -target %s %s %s %s' %
         (config.sil_opt, config.variant_triple, resource_dir_opt, mcp_opt, config.sil_test_options))