[Tests] Fix up a few more missing library paths.

Author: mikeash

test/Interpreter/protocol_lookup_jit.swift

@@ -1,5 +1,5 @@
 // Test protocol_lookup.swift in JIT mode.
-// RUN: %swift -interpret %S/protocol_lookup.swift | %FileCheck %S/protocol_lookup.swift --check-prefix=CHECK --check-prefix=CHECK-%target-runtime
+// RUN: %target-jit-run %S/protocol_lookup.swift | %FileCheck %S/protocol_lookup.swift --check-prefix=CHECK --check-prefix=CHECK-%target-runtime
 // REQUIRES: executable_test
 
 // REQUIRES: swift_interpreter

test/Interpreter/repl_autolinking.swift

@@ -4,7 +4,7 @@
 // RUN: sed -n -e '/REPL_START$/,/REPL_END$/ p' %s > %t/repl.swift
 // RUN: %target-swiftc_driver -emit-library %t/a.swift -I %t -L %t -emit-module-path %t/ModuleA.swiftmodule -autolink-force-load -module-link-name ModuleA -module-name ModuleA -o %t/libModuleA.dylib
 // RUN: %target-swiftc_driver -emit-library %t/b.swift -I %t -L %t -emit-module-path %t/ModuleB.swiftmodule -autolink-force-load -module-link-name ModuleB -module-name ModuleB -o %t/libModuleB.dylib
-// RUN: %swift -repl -I %t -L %t < %t/repl.swift 2>&1 | %FileCheck %s
+// RUN: %target-repl-run-swift -I %t -L %t < %t/repl.swift 2>&1 | %FileCheck %s
 
 // REQUIRES: swift_repl
 // UNSUPPORTED: OS=linux-gnu

test/lit.cfg

@@ -1083,8 +1083,10 @@ if 'swift_interpreter' in config.available_features:
         "%s -interpret %s" %
         (config.target_swift_frontend, sdk_overlay_link_path))
 
+subst_target_repl_run_swift = ""
 subst_target_repl_run_simple_swift = ""
 if 'swift_repl' in config.available_features:
+    subst_target_repl_run_swift = "%s -repl" % (config.target_swift_frontend)
     subst_target_repl_run_simple_swift = (
         "%s -repl %s < %%s 2>&1" %
         (config.target_swift_frontend, sdk_overlay_link_path))
@@ -1145,25 +1147,35 @@ if os.path.exists(static_libswiftCore_path):
 target_stdlib_path = platform_module_dir
 if 'use_os_stdlib' not in lit_config.params:
   lit_config.note('Testing with the just-built libraries at ' + target_stdlib_path)
-  config.target_run = (
+  library_path_env = (
     "/usr/bin/env "
     "DYLD_LIBRARY_PATH='{0}' " # Apple option
     "LD_LIBRARY_PATH='{0}' " # Linux option
     "SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
-    .format(target_stdlib_path)) + config.target_run
+    .format(target_stdlib_path))
+  config.target_run = library_path_env + config.target_run
+  subst_target_jit_run = library_path_env + subst_target_jit_run
+  config.swift_remoteast_test = library_path_env + config.swift_remoteast_test
+  subst_target_repl_run_simple_swift = library_path_env + subst_target_repl_run_simple_swift
+  subst_target_repl_run_swift = library_path_env + subst_target_repl_run_swift
 else:
   os_stdlib_path = ''
   if run_vendor == 'apple':
     #If we get swift-in-the-OS for non-Apple platforms, add a condition here
     os_stdlib_path = "/usr/lib/swift"
   all_stdlib_path = os.path.pathsep.join((os_stdlib_path, target_stdlib_path))
   lit_config.note('Testing with the standard libraries coming from the OS ' + all_stdlib_path)
-  config.target_run = (
+  library_path_env = (
     "/usr/bin/env "
     "DYLD_LIBRARY_PATH='{0}' " # Apple option
     "LD_LIBRARY_PATH='{0}' " # Linux option
     "SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
-    .format(all_stdlib_path)) + config.target_run
+    .format(all_stdlib_path))
+  config.target_run = library_path_env + config.target_run
+  subst_target_jit_run = library_path_env + subst_target_jit_run
+  config.swift_remoteast_test = library_path_env + config.swift_remoteast_test
+  subst_target_repl_run_simple_swift = library_path_env + subst_target_repl_run_simple_swift
+  subst_target_repl_run_swift = library_path_env + subst_target_repl_run_swift
 
 if not getattr(config, 'target_run_simple_swift', None):
     config.target_run_simple_swift_parameterized =                               \
@@ -1246,6 +1258,7 @@ config.substitutions.append(('%target-run-simple-opt-O-swift', config.target_run
 config.substitutions.append(('%target-run-simple-opt-Osize-swift', config.target_run_simple_opt_Osize_swift))
 config.substitutions.append(('%target-run-stdlib-swiftgyb', config.target_run_stdlib_swiftgyb))
 config.substitutions.append(('%target-run-stdlib-swift', config.target_run_stdlib_swift))
+config.substitutions.append(('%target-repl-run-swift', subst_target_repl_run_swift))
 config.substitutions.append(('%target-repl-run-simple-swift', subst_target_repl_run_simple_swift))
 config.substitutions.append(('%target-run', config.target_run))
 config.substitutions.append(('%target-jit-run', subst_target_jit_run))