[ossa-modules] Add a new lit pattern %relative-platform-module-dir-prefix so tests can use the proper prefix to have Swift find a fake sdk module.

Author: gottesmm

test/ModuleInterface/ossa-modules/sdk-test-stdlib-no-ossa.swift

@@ -10,10 +10,10 @@
 // RUN: %empty-directory(%t/TempModuleCacheLibrary)
 // RUN: %empty-directory(%t/TempModuleCacheBuilder)
 // RUN: %empty-directory(%t/TempModuleCacheOther)
-// RUN: %empty-directory(%t/SDK/usr/lib/swift/Swift.swiftmodule)
+// RUN: %empty-directory(%t/SDK/usr/lib/swift/%relative-platform-module-dir-prefix/Swift.swiftmodule)
 // RUN: %empty-directory(%t/PreBuiltSDKModules)
 
-// RUN: %target-swift-frontend -c -emit-module-interface-path %t/SDK/usr/lib/swift/Swift.swiftmodule/%target-swiftinterface-name -emit-module-path %t/SDK/usr/lib/swift/Swift.swiftmodule/%target-swiftmodule-name -o %t/Swift.o -parse-stdlib -module-name Swift -enable-library-evolution -module-cache-path %t/TempModuleCacheLibrary -swift-version 5 %s -disable-objc-interop
+// RUN: %target-swift-frontend -c -emit-module-interface-path %t/SDK/usr/lib/swift/%relative-platform-module-dir-prefix/Swift.swiftmodule/%target-swiftinterface-name -emit-module-path %t/SDK/usr/lib/swift/%relative-platform-module-dir-prefix/Swift.swiftmodule/%target-swiftmodule-name -o %t/Swift.o -parse-stdlib -module-name Swift -enable-library-evolution -module-cache-path %t/TempModuleCacheLibrary -swift-version 5 %s -disable-objc-interop
 
 // RUN: %swift_build_sdk_interfaces_base -o %t/PreBuiltSDKModules -j 1 -sdk %t/SDK -module-cache-path %t/TempModuleCacheBuilder %t/SDK -v
 

test/ModuleInterface/ossa-modules/sdk-test-stdlib-ossa.swift

@@ -10,10 +10,10 @@
 // RUN: %empty-directory(%t/TempModuleCacheLibrary)
 // RUN: %empty-directory(%t/TempModuleCacheBuilder)
 // RUN: %empty-directory(%t/TempModuleCacheOther)
-// RUN: %empty-directory(%t/SDK/usr/lib/swift/Swift.swiftmodule)
+// RUN: %empty-directory(%t/SDK/usr/lib/swift/%relative-platform-module-dir-prefix/Swift.swiftmodule)
 // RUN: %empty-directory(%t/PreBuiltSDKModules)
 
-// RUN: %target-swift-frontend -c -emit-module-interface-path %t/SDK/usr/lib/swift/Swift.swiftmodule/%target-swiftinterface-name -emit-module-path %t/SDK/usr/lib/swift/Swift.swiftmodule/%target-swiftmodule-name -o %t/Swift.o -parse-stdlib -module-name Swift -enable-library-evolution -module-cache-path %t/TempModuleCacheLibrary -swift-version 5 %s -disable-objc-interop -enable-ossa-modules
+// RUN: %target-swift-frontend -c -emit-module-interface-path %t/SDK/usr/lib/swift/%relative-platform-module-dir-prefix/Swift.swiftmodule/%target-swiftinterface-name -emit-module-path %t/SDK/usr/lib/swift/%relative-platform-module-dir-prefix/Swift.swiftmodule/%target-swiftmodule-name -o %t/Swift.o -parse-stdlib -module-name Swift -enable-library-evolution -module-cache-path %t/TempModuleCacheLibrary -swift-version 5 %s -disable-objc-interop -enable-ossa-modules
 
 // RUN: %swift_build_sdk_interfaces_base -o %t/PreBuiltSDKModules -j 1 -sdk %t/SDK -module-cache-path %t/TempModuleCacheBuilder %t/SDK -v
 

test/lit.cfg

@@ -1761,6 +1761,9 @@ rth_flags = ''
 if swift_execution_tests_extra_flags:
     rth_flags = swift_execution_tests_extra_flags + ' -wmo'
 
+relative_platform_module_dir_prefix = ''
+if platform.system() != 'Darwin':
+    relative_platform_module_dir_prefix = os.path.join(config.target_sdk_name, run_cpu)
 platform_module_dir = make_path(test_resource_dir, config.target_sdk_name)
 
 platform_dylib_dir = platform_module_dir
@@ -2011,6 +2014,7 @@ config.substitutions.append(('%target-swift-emit-pcm',
                              config.target_swift_emit_pcm))
 
 config.substitutions.insert(0, ('%platform-module-dir', platform_module_dir))
+config.substitutions.insert(0, ('%relative-platform-module-dir-prefix', relative_platform_module_dir_prefix))
 config.substitutions.insert(0, ('%platform-sdk-overlay-dir', platform_sdk_overlay_dir))
 config.substitutions.insert(0, ('%platform-dylib-dir', platform_dylib_dir))
 config.substitutions.insert(0, ('%test-resource-dir', test_resource_dir))