Merge branch 'main' into jgrynspan/third-party-testing-library-discovery

Author: grynspan

CODEOWNERS .github/CODEOWNERSCODEOWNERS renamed to .github/CODEOWNERS

@@ -1,11 +1,11 @@
 #
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2023–2025 Apple Inc. and the Swift project authors
+# Copyright (c) 2023–2026 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
 # See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 #
 
-* @stmontgomery @grynspan @briancroom @jerryjrchen
+* @stmontgomery @grynspan @briancroom @jerryjrchen @harlanhaskins

.github/workflows/automerge.yml

@@ -18,7 +18,7 @@ on:
 jobs:
   create_merge_pr:
     name: Create PR to merge main into release branch
-    uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@0.0.3
+    uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@0.0.7
     with:
       head_branch: main
       base_branch: release/6.3

.github/workflows/main_using_main.yml

@@ -15,11 +15,13 @@ concurrency:
 jobs:
   tests:
     name: Test
-    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.7
     with:
       linux_swift_versions: '["nightly-main"]'
       linux_os_versions: '["amazonlinux2", "jammy"]'
+      linux_static_sdk_versions: '["nightly-main"]'
       windows_swift_versions: '["nightly-main"]'
       enable_macos_checks: true
-      macos_exclude_xcode_versions: '[{"xcode_version": "16.2"}, {"xcode_version": "16.3"}, {"xcode_version": "16.4"}]'
+      macos_xcode_versions: '["26.2"]'
       enable_wasm_sdk_build: true
+      wasm_sdk_versions: '["nightly-main"]'

.github/workflows/main_using_release.yml

@@ -1,4 +1,4 @@
-name: main branch, 6.2 toolchain
+name: main branch, 6.3 toolchain
 
 permissions:
   contents: read
@@ -15,11 +15,13 @@ concurrency:
 jobs:
   tests:
     name: Test
-    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.7
     with:
-      linux_swift_versions: '["nightly-6.2"]'
+      linux_swift_versions: '["nightly-6.3"]'
       linux_os_versions: '["amazonlinux2", "jammy"]'
-      windows_swift_versions: '["nightly-6.2"]'
+      linux_static_sdk_versions: '["nightly-6.3"]'
+      windows_swift_versions: '["nightly-6.3"]'
       enable_macos_checks: true
-      macos_exclude_xcode_versions: '[{"xcode_version": "16.2"}, {"xcode_version": "16.3"}, {"xcode_version": "16.4"}]'
+      macos_xcode_versions: '["26.2"]'
       enable_wasm_sdk_build: true
+      wasm_sdk_versions: '["nightly-6.3"]'

.github/workflows/manual_build_openbsd.yml

@@ -0,0 +1,70 @@
+name: Manual OpenBSD/amd64 build (7.8)
+
+on:
+  workflow_dispatch:
+
+env:
+  META_DATA_CONTENT: |
+      {
+        "instance-id": "iid-local01",
+        "dsmode": "local"
+      }
+  USER_DATA_CONTENT: |
+      #cloud-config
+      timezone: UTC
+      write_files:
+      - content: |
+          set -ex
+          function atexit {
+              echo 1 > /tmp/result
+              tar cvf /dev/sd1c -C /tmp result
+              halt -p;
+          }
+          trap atexit EXIT
+          printf '\033\143'
+          export PATH=/usr/local/bin:$PATH
+          mount /dev/sd3c /mnt
+          cp -r /mnt/repo /home/repo/
+          cd /home/repo/
+          swift test
+          echo $? > /tmp/result
+          tar cvf /dev/sd1c -C /tmp result
+          halt -p
+        path: /etc/rc.local
+        permissions: '0755'
+
+jobs:
+  openbsd:
+    name: OpenBSD
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    container:
+      image: ghcr.io/3405691582/openbsd-swift-amd64:7.8
+      env:
+        CPU: "4"
+        MEM: "16G"
+        KVM: "-enable-kvm"
+      options: --device /dev/kvm
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Write cloud-init files
+        run: |
+            echo "$META_DATA_CONTENT" > /usr/local/share/cidata/meta-data
+            echo "$USER_DATA_CONTENT" > /usr/local/share/cidata/user-data
+
+      - name: Prepare cloud-init
+        run: |
+            cp -r $GITHUB_WORKSPACE /usr/local/share/cidata/repo/ && \
+            cat /usr/local/share/cidata/meta-data && \
+            cat /usr/local/share/cidata/user-data && \
+            ls /usr/local/share/cidata
+
+      - name: Run
+        run: /usr/local/bin/cmd.sh
+
+      - name: Report
+        run: |
+            ls -l /usr/local/share/tape && \
+            exit $(cat /usr/local/share/tape/result)

.github/workflows/pull_request.yml

@@ -14,20 +14,22 @@ concurrency:
 jobs:
   tests:
     name: Test
-    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.7
     with:
-      linux_swift_versions: '["nightly-main", "nightly-6.3", "nightly-6.2"]'
+      linux_swift_versions: '["nightly-main", "nightly-6.3"]'
       linux_os_versions: '["amazonlinux2", "jammy"]'
-      windows_swift_versions: '["nightly-main", "nightly-6.3", "nightly-6.2"]'
+      linux_static_sdk_versions: '["nightly-main"]'
+      windows_swift_versions: '["nightly-main", "nightly-6.3"]'
       enable_macos_checks: true
-      macos_exclude_xcode_versions: '[{"xcode_version": "16.2"}, {"xcode_version": "16.3"}, {"xcode_version": "16.4"}]'
+      macos_xcode_versions: '["26.2"]'
       enable_ios_checks: true
-      ios_host_exclude_xcode_versions: '[{"xcode_version": "16.2"}, {"xcode_version": "16.3"}, {"xcode_version": "16.4"}]'
+      ios_host_xcode_versions: '["26.2"]'
       enable_wasm_sdk_build: true
+      wasm_sdk_versions: '["nightly-main", "nightly-6.3"]'
       enable_android_sdk_build: true
   soundness:
     name: Soundness
-    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.3
+    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.7
     with:
       license_header_check_project_name: "Swift"
       docs_check_enabled: false

CMakeLists.txt

@@ -59,3 +59,4 @@ set(SwiftTesting_INSTALL_SWIFTMODULEDIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<
 add_compile_options($<$<COMPILE_LANGUAGE:Swift>:-no-toolchain-stdlib-rpath>)
 
 add_subdirectory(Sources)
+add_subdirectory(cmake/modules)

Documentation/ABI/JSON.md

@@ -39,7 +39,9 @@ array (also defined as in JSON) whose elements all follow rule `<T>`.
 <bool> ::= true | false ; as in JSON
 
 <source-location> ::= {
-  "fileID": <string>, ; the Swift file ID of the file
+  ["fileID": <string>,] ; the Swift file ID of the file if available, as per
+                        ; SE-0274 § "Specification of the #file string format"
+  "filePath": <string>, ; the compile-time path to the file
   "line": <number>,
   "column": <number>,
 }
@@ -49,7 +51,8 @@ array (also defined as in JSON) whose elements all follow rule `<T>`.
   "since1970": <number>, ; floating-point seconds since 1970-01-01 00:00:00 UT
 }
 
-<version> ::= "version": 0 ; will be incremented as the format changes
+<version> ::= "version": <version-number>
+<version-number> ::= 0 | "<version core>" ; as per https://semver.org
 ```
 
 <!--
@@ -157,10 +160,21 @@ additional `"testCases"` field describing the individual test cases.
   ["displayName": <string>,] ; the user-supplied custom display name
   "sourceLocation": <source-location>, ; where the test is defined
   "id": <test-id>,
-  "isParameterized": <bool> ; is this a parameterized test function or not?
+  "isParameterized": <bool>, ; is this a parameterized test function or not?
+  ["tags": <array:tag>,] ; the tags associated with this test function
+  ["bugs": <array:bug>,] ; the bugs associated with this test function
+  ["timeLimit": <number>] ; the time limit associated with this test function
 }
 
 <test-id> ::= <string> ; an opaque string representing the test case
+
+<tag> ::= <string> ; a string representation of a tag
+
+<bug> ::= {
+  ["url": <string>,] ; the bug URL
+  ["id": <string>,] ; the bug id
+  ["title": <string>] ; the human readable bug title
+}
 ```
 
 <!--
@@ -195,7 +209,8 @@ sufficient information to display the event in a human-readable format.
 
 <event-kind> ::= "runStarted" | "testStarted" | "testCaseStarted" |
   "issueRecorded" | "testCaseEnded" | "testEnded" | "testSkipped" |
-  "runEnded" | "valueAttached"; additional event kinds may be added in the future
+  "runEnded" | "valueAttached" | "testCancelled" | "testCaseCancelled"
+  ; additional event kinds may be added in the future
 
 <issue> ::= {
   "isKnown": <bool>, ; is this a known issue or not?
@@ -219,3 +234,16 @@ sufficient information to display the event in a human-readable format.
   ["testID": <test-id>,
     ["testCase": <test-case>]]
 -->
+
+## See Also
+
+### Relevant Swift Evolution proposals
+
+| Proposal Number | Summary | Swift Version | Schema Version |
+|:-|-|-:|-:|
+| [ST-0002](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0002-json-abi.md) | Introduced the initial version of this JSON schema. | 6.0 | `0` |
+| [ST-0009](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0009-attachments.md#integration-with-supporting-tools) | Added attachments. | 6.2 | `0` |
+| [ST-0013](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0013-issue-severity-warning.md#event-stream) | Added test issue severity. | 6.3 | `"6.3"` |
+| [ST-0016](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0016-test-cancellation.md#integration-with-supporting-tools) | Added test cancellation. | 6.3 | `"6.3"` |
+| [ST-0019](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0019-include-tags-bugs-and-timeline-in-event-stream.md#json-schema-changes) | Added `tags`, `bugs`, and `timeLimit`. | 6.4 | `"6.4"` |
+| [ST-0020](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0020-sourcelocation-filepath.md#detailed-design) | Added `filePath`. | 6.3 | `"6.3"` |

Documentation/ABI/TestContent.md

@@ -13,11 +13,6 @@ See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 This document describes the format and location of test content that the testing
 library emits at compile time and can discover at runtime.
 
-> [!WARNING]
-> The content of this document is subject to change pending efforts to define a
-> Swift-wide standard mechanism for runtime metadata emission and discovery.
-> Treat the information in this document as experimental.
-
 ## Basic format
 
 Swift Testing stores test content records in a dedicated platform-specific

Documentation/CommandlineDebugging.md

@@ -0,0 +1,100 @@
+# Debugging Swift Testing on the Commandline using LLDB
+
+<!--
+This source file is part of the Swift.org open source project
+
+Copyright (c) 2026 Apple Inc. and the Swift project authors
+Licensed under Apache License v2.0 with Runtime Library Exception
+
+See https://swift.org/LICENSE.txt for license information
+See https://swift.org/CONTRIBUTORS.txt for Swift project authors
+-->
+
+For most cases, `swift test` is sufficient to build and run tests. The
+instructions below are for when you need to attach LLDB to debug test code
+directly. Doing this differs significantly between Darwin and non-Darwin
+platforms.
+
+## Darwin Platforms
+
+On Darwin, SwiftPM packages tests into xctest bundles. These bundles are not
+directly executable and must be run using the `swiftpm-testing-helper` tool.
+
+### swiftpm-testing-helper
+
+The helper is located within the toolchain:
+
+```sh
+# Xcode toolchain
+/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/libexec/swift/pm/swiftpm-testing-helper
+
+# Custom toolchain
+/path/to/toolchain/usr/libexec/swift/pm/swiftpm-testing-helper
+```
+
+Required arguments:
+
+1. `--test-bundle-path`: Path to the test bundle executable (e.g.,
+   `MyTests.xctest/Contents/MacOS/MyTests`)
+2. `--testing-library swift-testing`: Specifies that Swift Testing should be
+   used.
+
+Additional `swift test` arguments (such as `--filter`) can also be passed. Run
+`swift test --help` for the full list of available options.
+
+### Example: Debugging with LLDB
+
+```sh
+lldb -- /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/libexec/swift/pm/swiftpm-testing-helper \
+  --test-bundle-path MyTests.xctest/Contents/MacOS/MyTests \
+  --testing-library swift-testing
+```
+
+This launches LLDB with the testing helper configured to run your test bundle.
+You can then set breakpoints and debug your tests normally.
+
+### How Swift Testing Is Linked
+
+Swift Testing ships in two forms: Testing.framework and libTesting.dylib. The
+compiler you use to build your test bundle determines which library it links
+against. At runtime, the dynamic linker must find the matching library. Problems
+occur when the build-time and runtime environments don't match—for example, if
+you build with a custom toolchain but run with system libraries, or vice versa.
+
+If you encounter missing symbols or unexpected behavior, export the environment
+variables `DYLD_LIBRARY_PATH` or `DYLD_FRAMEWORK_PATH` as appropriate to point
+to the correct location.
+
+## Non-Darwin Platforms
+
+On non-Darwin platforms, SwiftPM builds test targets as standalone executables
+rather than bundles. You can debug them directly:
+
+```sh
+lldb -- .build/debug/MyPackagePackageTests.xctest
+```
+
+### Double-Invocation Gotcha
+
+When using Swift Testing on non-Darwin, `swift test` invokes the test binary
+twice:
+
+1. **First invocation**: Runs XCTest-based tests via `XCTestMain()`
+2. **Second invocation**: Runs Swift Testing tests by passing
+   `--testing-library swift-testing`
+
+This is an internal SwiftPM implementation detail. When debugging, you likely
+want to skip the XCTest invocation and run Swift Testing directly.
+
+### Example: Debugging with LLDB
+
+To debug only Swift Testing tests, pass `--testing-library` explicitly:
+
+```sh
+lldb -- .build/debug/MyPackagePackageTests.xctest --testing-library swift-testing
+```
+
+### Passing Arguments
+
+Arguments such as `--filter` are passed through to Swift Testing directly. Run
+`swift test --help` for the full list of available options.