[lit] Use simulator triples consistently.

Author: DougGregor

test/IRGen/objc_properties_ios.swift

@@ -1,5 +1,5 @@
-// RUN: %swift -target x86_64-apple-ios9 %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %S/objc_properties.swift
-// RUN: %swift -target x86_64-apple-ios8 %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %S/objc_properties.swift
+// RUN: %swift -target x86_64-apple-ios9-simulator %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %S/objc_properties.swift
+// RUN: %swift -target x86_64-apple-ios8-simulator %S/objc_properties.swift -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %S/objc_properties.swift
 
 // REQUIRES: OS=ios
 // REQUIRES: CPU=x86_64

test/lit.cfg

@@ -328,6 +328,9 @@ if run_os == 'ios' and run_vers.endswith('-macabi'):
     run_os = 'maccatalyst'
 if run_vers.endswith('-simulator'):
     run_vers = run_vers[0:-len('-simulator')]
+    run_environment='-simulator'
+else:
+    run_environment=''
 
 run_ptrsize = '64' if ('64' in run_cpu or run_cpu == "s390x") else '32'
 run_ptrauth = 'ptrauth' if run_cpu == 'arm64e' else 'noptrauth'
@@ -635,8 +638,8 @@ if run_vendor == 'apple':
             }
             pre_stable_version = PRE_STABLE_VERSION.get(run_os, '')
 
-        config.pre_stable_abi_triple = '%s-%s-%s%s' % (run_cpu, run_vendor, run_os,
-                                                       pre_stable_version)
+        config.pre_stable_abi_triple = '%s-%s-%s%s%s' % (run_cpu, run_vendor, run_os,
+                                                         pre_stable_version, run_environment)
         STABLE_VERSION = {
             'macosx': '10.14.4',
             'ios': '12.2',
@@ -645,8 +648,8 @@ if run_vendor == 'apple':
             'watchos': '5.2'
         }
         stable_version = STABLE_VERSION.get(run_os, '')
-        config.stable_abi_triple = '%s-%s-%s%s' % (run_cpu, run_vendor, run_os,
-                                                   stable_version)
+        config.stable_abi_triple = '%s-%s-%s%s%s' % (run_cpu, run_vendor, run_os,
+                                                     stable_version, run_environment)
 
         NEXT_STABLE_VERSION = {
             'macosx': '10.15',
@@ -656,8 +659,9 @@ if run_vendor == 'apple':
             'watchos': '6'
         }
         next_stable_version = NEXT_STABLE_VERSION.get(run_os, '')
-        config.next_stable_abi_triple = '%s-%s-%s%s' % (run_cpu, run_vendor, run_os,
-                                                        next_stable_version)
+        config.next_stable_abi_triple = '%s-%s-%s%s%s' % (run_cpu, run_vendor, run_os,
+                                                          next_stable_version, run_environment)
+
 else:
     config.pre_stable_abi_triple = config.variant_triple
     config.stable_abi_triple = config.variant_triple
@@ -1012,7 +1016,8 @@ if run_vendor == 'apple':
         % (config.target_build_swift))
     config.target_add_rpath = r'-Xlinker -rpath -Xlinker \1'
 
-    target_future = format('%s-apple-%s%s' % (run_cpu, run_os, target_future_version))
+    target_future = format('%s-apple-%s%s%s' % (run_cpu, run_os, target_future_version, run_environment))
+
     config.otool_classic = ("%s otool-classic" % (xcrun_prefix))
 
 elif run_os in ['windows-msvc']: