Merge branch 'main' into jgrynspan/remove-wasm-workaround

Author: grynspan

.github/workflows/pull_request.yml

@@ -23,6 +23,6 @@ jobs:
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
     with:
       license_header_check_project_name: "Swift"
-      docs_check_enabled: false
+      docs_check_container_image: "swift:6.2-noble"
       format_check_enabled: false
       api_breakage_check_enabled: false

Sources/Testing/Testing.docc/Documentation.md

@@ -35,10 +35,8 @@ their problems.
 
 #### Related videos
 
-@Links(visualStyle: compactGrid) {
-  - <doc://com.apple.documentation/videos/play/wwdc2024/10179>
-  - <doc://com.apple.documentation/videos/play/wwdc2024/10195>
-}
+- [Meet Swift Testing](https://developer.apple.com/videos/play/wwdc2024/10179)
+- [Go further with Swift Testing](https://developer.apple.com/videos/play/wwdc2024/10195)
 
 ## Topics
 

Sources/Testing/Testing.docc/MigratingFromXCTest.md

@@ -556,9 +556,11 @@ test function with an instance of this trait type to control whether it runs:
   }
 }
 
-<!-- TODO: document Test.cancel() and Test.Case.cancel() here
+<!-- TODO: document Test.cancel() and Test.Case.cancel() here, and update
+     relevant links to use proper DocC symbol references.
+
 If a test has already started running and you determine it cannot complete and
-should end early without failing, use ``Test/cancel(_:sourceLocation:)`` instead
+should end early without failing, use `Test/cancel(_:sourceLocation:)` instead
 of [`XCTSkip`](https://developer.apple.com/documentation/xctest/xctskip) to
 cancel the task associated with the current test:
 
@@ -592,7 +594,7 @@ cancel the task associated with the current test:
 }
 
 If the test is parameterized and you only want to cancel the current test case
-rather than the entire test, use ``Test/Case/cancel(_:sourceLocation:)``.
+rather than the entire test, use `Test/Case/cancel(_:sourceLocation:)`.
 -->
 
 ### Annotate known issues

Sources/_TestingInternals/Versions.cpp

@@ -13,36 +13,44 @@
 #include <array>
 #include <algorithm>
 #include <iterator>
+#include <mutex>
 
 const char *swt_getTestingLibraryVersion(void) {
 #if defined(SWT_TESTING_LIBRARY_VERSION)
   // The current environment explicitly specifies a version string to return.
+  // All CMake builds should take this path (see CompilerSettings.cmake.)
   return SWT_TESTING_LIBRARY_VERSION;
-#elif __has_embed("../../VERSION.txt")
-  static constinit auto version = [] () constexpr {
-    // Read the version from version.txt at the root of the package's repo.
-    char version[] = {
+#elif __clang_major__ >= 17 && defined(__has_embed)
+#if __has_embed("../../VERSION.txt")
+  // Read the version from version.txt at the root of the package's repo.
+  static char version[] = {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wc23-extensions"
-#embed "../../VERSION.txt"
+#embed "../../VERSION.txt" suffix(, '\0')
 #pragma clang diagnostic pop
-    };
+  };
 
-    // Copy the first line from the C string into a C array so that we can
-    // return it from this closure.
-    std::array<char, std::size(version) + 1> result {};
+  // Zero out the newline character and anything after it.
+  static std::once_flag once;
+  std::call_once(once, [] {
     auto i = std::find_if(std::begin(version), std::end(version), [] (char c) {
       return c == '\r' || c == '\n';
     });
-    std::copy(std::begin(version), i, result.begin());
-    return result;
-  }();
+    std::fill(i, std::end(version), '\0');
+  });
 
-  return version.data();
+  return version;
 #else
 #warning SWT_TESTING_LIBRARY_VERSION not defined and VERSION.txt not found: testing library version is unavailable
   return nullptr;
 #endif
+#elif defined(__OpenBSD__)
+  // OpenBSD's version of clang doesn't support __has_embed or #embed.
+  return nullptr;
+#else
+#warning SWT_TESTING_LIBRARY_VERSION not defined and could not read from VERSION.txt at compile time: testing library version is unavailable
+  return nullptr;
+#endif
 }
 
 void swt_getTestingLibraryCommit(const char *_Nullable *_Nonnull outHash, bool *outModified) {

cmake/modules/shared/CompilerSettings.cmake

@@ -42,3 +42,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
   add_compile_definitions("SWT_NO_DYNAMIC_LINKING")
   add_compile_definitions("SWT_NO_PIPES")
 endif()
+
+file(STRINGS "../VERSION.txt" SWT_TESTING_LIBRARY_VERSION LIMIT_COUNT 1)
+if(SWT_TESTING_LIBRARY_VERSION)
+  message(STATUS "Swift Testing version: ${SWT_TESTING_LIBRARY_VERSION}")
+  add_compile_definitions("$<$<COMPILE_LANGUAGE:CXX>:SWT_TESTING_LIBRARY_VERSION=\"${SWT_TESTING_LIBRARY_VERSION}\">")
+endif()