Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

test/Distributed/Runtime/distributed_actor_deinit.swift

@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift -target %target-future-triple %import-libdispatch -parse-stdlib -parse-as-library -module-name=main %s -o %t/a.out
 // RUN: %target-codesign %t/a.out
-// RUN: %env-SWIFT_IS_CURRENT_EXECUTOR_LEGACY_MODE_OVERRIDE=legacy %target-run %t/a.out | %FileCheck %s
+// RUN: env %env-SWIFT_IS_CURRENT_EXECUTOR_LEGACY_MODE_OVERRIDE=legacy %target-run %t/a.out | %FileCheck %s
 
 // REQUIRES: libdispatch
 // REQUIRES: executable_test

test/Distributed/Runtime/distributed_actor_remoteCall_accessibleFunctions.swift

@@ -2,7 +2,7 @@
 // RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -target %target-swift-6.0-abi-triple %S/../Inputs/FakeDistributedActorSystems.swift -plugin-path %swift-plugin-dir
 // RUN: %target-build-swift -module-name ActorsFramework -target %target-swift-6.0-abi-triple -j2 -parse-as-library -I %t %s %S/../Inputs/FakeDistributedActorSystems.swift -plugin-path %swift-plugin-dir -o %t/a.out
 // RUN: %target-codesign %t/a.out
-// RUN: %env-SWIFT_DUMP_ACCESSIBLE_FUNCTIONS=true %target-run %t/a.out 2>&1 | %FileCheck %s --color --dump-input=always
+// RUN: env %env-SWIFT_DUMP_ACCESSIBLE_FUNCTIONS=true %target-run %t/a.out 2>&1 | %FileCheck %s --color --dump-input=always
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency

test/Distributed/Runtime/distributed_actor_remoteCall_accessibleFunctions_crossModule.swift

@@ -67,7 +67,7 @@
 // RUN: %target-codesign %t/%target-library-name(ResilientImplLib)
 
 // Run and verify output
-// RUN: %env-SWIFT_DUMP_ACCESSIBLE_FUNCTIONS=true %target-run %t/a.out                                                   \
+// RUN: env %env-SWIFT_DUMP_ACCESSIBLE_FUNCTIONS=true %target-run %t/a.out                                                   \
 // RUN:     %t/%target-library-name(FakeDistributedActorSystems)               \
 // RUN:     %t/%target-library-name(ResilientAPILib)                           \
 // RUN:     %t/%target-library-name(ResilientImplLib)                          \

test/lit.cfg

@@ -1667,8 +1667,8 @@ if run_vendor == 'apple':
 
     config.target_build_swift_dylib = SubstituteCaptures(
         f"{escape_for_substitute_captures(config.target_build_swift)}"
-        r" -parse-as-library -emit-library -o '\1'"
-        r" -Xlinker -install_name -Xlinker @executable_path/$(basename '\1')"
+        r" -parse-as-library -emit-library -o '\1\2'"
+        r" -Xlinker -install_name -Xlinker @executable_path/\2"
     )
     config.target_add_rpath = SubstituteCaptures(r'-Xlinker -rpath -Xlinker \1')
 
@@ -1766,7 +1766,7 @@ elif run_os in ['windows-msvc']:
     subst_target_swift_frontend_mock_sdk_after = ''
 
     config.target_build_swift_dylib =                                            \
-            SubstituteCaptures(r"%s -parse-as-library -emit-library -o \1" % (
+            SubstituteCaptures(r"%s -parse-as-library -emit-library -o \1\2" % (
                 escape_for_substitute_captures(config.target_build_swift)))
     config.target_add_rpath = r''
 
@@ -1904,7 +1904,7 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
     config.target_codesign = "echo"
     config.target_build_swift_dylib = SubstituteCaptures(
         f"{escape_for_substitute_captures(config.target_build_swift)}"
-        r" -parse-as-library -emit-library -o '\1'"
+        r" -parse-as-library -emit-library -o '\1\2'"
     )
     config.target_add_rpath = SubstituteCaptures(r'-Xlinker -rpath -Xlinker \1')
     config.target_swift_frontend = (
@@ -1998,7 +1998,7 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
     config.target_codesign = "echo"
     config.target_build_swift_dylib = SubstituteCaptures(
         f"{escape_for_substitute_captures(config.target_build_swift)}"
-        r" -parse-as-library -emit-library -o '\1'"
+        r" -parse-as-library -emit-library -o '\1\2'"
     )
     config.target_add_rpath = SubstituteCaptures(r'-Xlinker -rpath -Xlinker \1')
     config.target_swift_frontend = ' '.join([
@@ -2085,7 +2085,7 @@ elif kIsWASI:
     config.target_codesign = "echo"
     config.target_build_swift_dylib = SubstituteCaptures(
         f"{escape_for_substitute_captures(config.target_build_swift)}"
-        r" -parse-as-library -emit-library -static -o '\1'"
+        r" -parse-as-library -emit-library -static -o '\1\2'"
     )
     config.target_add_rpath = ''
     config.target_swift_frontend = ' '.join([
@@ -2169,7 +2169,7 @@ elif config.external_embedded_platform:
     config.target_codesign = "echo"
     config.target_build_swift_dylib = SubstituteCaptures(
         f"{escape_for_substitute_captures(config.target_build_swift)}"
-        r" -parse-as-library -emit-library -static -o '\1'"
+        r" -parse-as-library -emit-library -static -o '\1\2'"
     )
     config.target_add_rpath = ''
     config.target_swift_frontend = ' '.join([
@@ -2940,7 +2940,10 @@ config.substitutions.append(('%target-run-stdlib-swift', config.target_run_stdli
 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))
-config.substitutions.append(('%target-build-swift-dylib\(([^)]+)\)', config.target_build_swift_dylib))
+# Capture groups:
+# \1 = path before the file name (non-greedy)
+# \2 = file name (last component, no slashes or parentheses)
+config.substitutions.append(('%target-build-swift-dylib\(([^)]+?)([^/\\()]+)\)', config.target_build_swift_dylib))
 config.substitutions.append(('%target-codesign', config.target_codesign))
 config.substitutions.append(('%target-build-swift', config.target_build_swift))
 config.substitutions.append(('%target-clang', config.target_clang))