[Tests] Fix up lit.cfg after the cherry-picks.

Author: mikeash

test/lit.cfg

@@ -1143,28 +1143,27 @@ if os.path.exists(static_libswiftCore_path):
 # Set up testing with the standard libraries coming from the OS / just-built libraries
 # default Swift tests to use the just-built libraries
 target_stdlib_path = platform_module_dir
-if not kIsWindows:
-	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 = (
-			"/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
-	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 = (
-			"/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
+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 = (
+    "/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
+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 = (
+    "/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
 
 if not getattr(config, 'target_run_simple_swift', None):
     config.target_run_simple_swift_parameterized =                               \
@@ -1180,6 +1179,18 @@ 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_opt_O_swift = (
+        '%%empty-directory(%%t) && '
+        '%s %s -O %%s -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_opt_Osize_swift = (
+        '%%empty-directory(%%t) && '
+        '%s %s -Osize %%s -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_stdlib_swift = (
         '%%empty-directory(%%t) && '
         '%s %s %%s -o %%t/a.out -module-name main '