Start cross-compiling the new Swift Testing library on the CI for the development branches

Author: finagolfin

.github/workflows/sdks.yml

@@ -31,7 +31,7 @@ jobs:
             SWIFT_TAG="swift-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
           fi
           echo "tag=$SWIFT_TAG" >> $GITHUB_OUTPUT
-          echo "key=$SWIFT_TAG-ndk-${NDK_VERSION}-pic-bundle" >> $GITHUB_OUTPUT
+          echo "key=$SWIFT_TAG-ndk-${NDK_VERSION}-testing-bundle" >> $GITHUB_OUTPUT
       - name: Get cached SDK bundle
         id: cache-bundle
         uses: actions/cache/restore@v4
@@ -136,7 +136,11 @@ jobs:
             if [ ${{ matrix.version }} = 'devel' ]; then
               perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
               LSP_BUILD="--sourcekit-lsp"
+              git apply swift-android-testing-devel.patch
+            else
+              git apply swift-android-testing-trunk.patch
             fi
+            TESTING_BUILD="--swift-testing --install-swift-testing"
             git apply swift-android-ci-except-release.patch swift-android-foundation-except-release.patch
           fi
 
@@ -159,7 +163,7 @@ jobs:
               perl -pi -e "s%/data/data/com.termux/files%$SDK%g" $SDK/usr/lib/pkgconfig/sqlite3.pc
             fi
 
-            ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK_LATEST_HOME --android-arch $arch --android-api-level $ANDROID_API_LEVEL --build-swift-tools=0 --native-swift-tools-path=${TOOLCHAIN}/bin --native-clang-tools-path=${TOOLCHAIN}/bin --cross-compile-hosts=android-$arch --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='compiler;clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False -b -p --install-llbuild $LSP_BUILD
+            ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK_LATEST_HOME --android-arch $arch --android-api-level $ANDROID_API_LEVEL --build-swift-tools=0 --native-swift-tools-path=${TOOLCHAIN}/bin --native-clang-tools-path=${TOOLCHAIN}/bin --cross-compile-hosts=android-$arch --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='compiler;clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False -b -p --install-llbuild $LSP_BUILD $TESTING_BUILD
 
             pushd ${SDK_NAME}/usr
 
@@ -169,9 +173,9 @@ jobs:
             if [ ${{ matrix.version }} = 'release' ]; then
               rm -r lib/swift/pm
             fi
-            mv include/curl include/libxml2 include/spawn.h .
+            mv include/curl include/execinfo.h include/libxml2 include/spawn.h .
             rm -r include/*
-            mv curl libxml2 spawn.h include/
+            mv curl execinfo.h libxml2 spawn.h include/
             cp -r ../../swift/lib/ClangImporter/SwiftBridging/{module.modulemap,swift} include/
 
             TRIPLE="$arch-linux-android"

get-packages-and-swift-source.swift

@@ -3,12 +3,13 @@ import Foundation
 // The Termux packages to download and unpack
 // libxml2 needs liblzma and libiconv
 // libcurl needs zlib, libnghttp3, libnghttp2, libssh2, and openssl
-var termuxPackages = ["libandroid-spawn", "libandroid-spawn-static", "libcurl", "zlib", "libxml2", "libnghttp3", "libnghttp2", "libssh2", "openssl", "liblzma", "libiconv"]
+// Testing needs backtrace() from libandroid-execinfo
+var termuxPackages = ["libandroid-execinfo", "libandroid-spawn", "libandroid-spawn-static", "libcurl", "zlib", "libxml2", "libnghttp3", "libnghttp2", "libssh2", "openssl", "liblzma", "libiconv"]
 let termuxURL = "https://packages.termux.dev/apt/termux-main"
 
 let swiftRepos = ["llvm-project", "swift", "swift-experimental-string-processing", "swift-corelibs-libdispatch",
                   "swift-corelibs-foundation", "swift-corelibs-xctest", "swift-syntax", "swift-collections",
-                  "swift-foundation", "swift-foundation-icu"]
+                  "swift-foundation", "swift-foundation-icu", "swift-testing"]
 
 let extraSwiftRepos = ["swift-llbuild", "swift-package-manager", "swift-driver",
                        "swift-tools-support-core", "swift-argument-parser", "swift-crypto",

swift-android-foundation-except-release.patch

@@ -10,6 +10,43 @@ index 16e05052609..7ab8cebfab8 100755
 
                    cmake_options=(
                      -DENABLE_SWIFT=YES
+diff --git a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
+index 324d1a77eea..e88601a8701 100644
+--- a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
++++ b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
+@@ -13,6 +13,9 @@
+ import os
+ 
+ from build_swift.build_swift.versions import Version
++from ..host_specific_configuration \
++    import HostSpecificConfiguration
++from ..targets import StdlibDeploymentTarget
+ 
+ from . import cmake_product
+ from . import product
+@@ -115,6 +117,22 @@ class SwiftTestingCMakeShim(cmake_product.CMakeProduct):
+         # FIXME: If we build macros for the builder, specify the path.
+         self.cmake_options.define('SwiftTesting_MACRO', 'NO')
+ 
++        if host_target.startswith('android') and self.is_cross_compile_target(host_target):
++            host_config = HostSpecificConfiguration(host_target, self.args)
++            self.cmake_options.extend(host_config.cmake_options)
++            flags = '-target %s-unknown-linux-android%s ' % (self.args.android_arch,
++                                                             self.args.android_api_level)
++
++            flags += '-resource-dir %s/lib/swift ' % (
++                     self.host_install_destdir(host_target) + self.args.install_prefix)
++
++            ndk_path = StdlibDeploymentTarget.get_target_for_name(host_target).platform.ndk_toolchain_path(self.args)
++            flags += '-sdk %s/sysroot ' % (ndk_path)
++            flags += '-tools-directory %s/bin' % (ndk_path)
++            self.cmake_options.define('CMAKE_Swift_FLAGS', flags)
++            self.cmake_options.define('CMAKE_CXX_COMPILER_WORKS', 'True')
++            self.cmake_options.define('CMAKE_FIND_ROOT_PATH', self.args.cross_compile_deps_path)
++
+         self.generate_toolchain_file_for_darwin_or_linux(
+             host_target, override_macos_deployment_version=override_deployment_version)
+         self.build_with_cmake([], self.args.build_variant, [],
 diff --git a/swift-corelibs-foundation/Sources/Foundation/Process.swift b/swift-corelibs-foundation/Sources/Foundation/Process.swift
 index 758dd1df..02970992 100644
 --- a/swift-corelibs-foundation/Sources/Foundation/Process.swift
@@ -39,3 +76,61 @@ index 758dd1df..02970992 100644
  #endif
          try _throwIfPosixError(posix_spawnattr_init(&spawnAttrs))
          try _throwIfPosixError(posix_spawnattr_setflags(&spawnAttrs, .init(POSIX_SPAWN_SETPGROUP)))
+diff --git a/swift-testing/CMakeLists.txt b/swift-testing/CMakeLists.txt
+index 1be9a4b..bd7b1bd 100644
+--- a/swift-testing/CMakeLists.txt
++++ b/swift-testing/CMakeLists.txt
+@@ -28,6 +28,7 @@ list(APPEND CMAKE_MODULE_PATH
+   ${PROJECT_SOURCE_DIR}/cmake/modules
+   ${PROJECT_SOURCE_DIR}/cmake/modules/shared)
+ 
++set(CMAKE_SHARED_LINKER_FLAGS "")
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+diff --git a/swift-testing/Sources/Testing/CMakeLists.txt b/swift-testing/Sources/Testing/CMakeLists.tx
+index e40cb1b..ff2f920 100644
+--- a/swift-testing/Sources/Testing/CMakeLists.txt
++++ b/swift-testing/Sources/Testing/CMakeLists.txt
+@@ -110,7 +110,10 @@ target_link_libraries(Testing PRIVATE
+ if(NOT APPLE)
+   if(NOT CMAKE_SYSTEM_NAME STREQUAL WASI)
+     target_link_libraries(Testing PUBLIC
+-      dispatch)
++      dispatch android-execinfo)
++    list(GET CMAKE_FIND_ROOT_PATH 0 BT_DIR)
++    target_include_directories(Testing PUBLIC ${BT_DIR}/usr/include)
++    target_link_directories(Testing PUBLIC ${BT_DIR}/usr/lib)
+   endif()
+   target_link_libraries(Testing PUBLIC
+     Foundation)
+diff --git a/swift-testing/cmake/modules/SwiftModuleInstallation.cmake b/swift-testing/cmake/modules/SwiftModuleInstallation.cmake
+index 1553725..d9f9e5b 100644
+--- a/swift-testing/cmake/modules/SwiftModuleInstallation.cmake
++++ b/swift-testing/cmake/modules/SwiftModuleInstallation.cmake
+@@ -75,6 +75,10 @@ function(_swift_testing_install_target module)
+     set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info)
+     if(CMAKE_Swift_COMPILER_TARGET)
+       list(APPEND module_triple_command -target ${CMAKE_Swift_COMPILER_TARGET})
++    else()
++      set(arg_list ${CMAKE_Swift_FLAGS})
++      separate_arguments(arg_list)
++      list(APPEND module_triple_command ${arg_list})
+     endif()
+     execute_process(COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json)
+     string(JSON module_triple GET "${target_info_json}" "target" "moduleTriple")
+diff --git a/swift-testing/cmake/modules/TargetTriple.cmake b/swift-testing/cmake/modules/TargetTriple.cmake
+index e087cc4..02f3a95 100644
+--- a/swift-testing/cmake/modules/TargetTriple.cmake
++++ b/swift-testing/cmake/modules/TargetTriple.cmake
+@@ -10,6 +10,10 @@
+ set(SWT_TARGET_INFO_COMMAND "${CMAKE_Swift_COMPILER}" -print-target-info)
+ if(CMAKE_Swift_COMPILER_TARGET)
+   list(APPEND SWT_TARGET_INFO_COMMAND -target ${CMAKE_Swift_COMPILER_TARGET})
++else()
++      set(arg_list ${CMAKE_Swift_FLAGS})
++      separate_arguments(arg_list)
++      list(APPEND SWT_TARGET_INFO_COMMAND ${arg_list})
+ endif()
+ execute_process(COMMAND ${SWT_TARGET_INFO_COMMAND} OUTPUT_VARIABLE SWT_TARGET_INFO_JSON)
+ string(JSON SWT_TARGET_TRIPLE GET "${SWT_TARGET_INFO_JSON}" "target" "unversionedTriple")

swift-android-testing-devel.patch

@@ -0,0 +1,31 @@
+diff --git a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
+index b6bfa5760ef..324d1a77eea 100644
+--- a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
++++ b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
+@@ -51,7 +51,7 @@ class SwiftTesting(product.Product):
+         return False
+ 
+     def should_install(self, host_target):
+-        return self.args.install_swift_testing_macros
++        return self.args.install_swift_testing
+ 
+     def _cmake_product(self, host_target):
+         build_root = os.path.dirname(self.build_dir)
+diff --git a/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift b/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
+index 78227e3..e0db2e9 100644
+--- a/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
++++ b/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
+@@ -65,11 +65,11 @@ public struct Backtrace: Sendable {
+       } else {
+         initializedCount = .init(clamping: backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))
+       }
+-#elseif os(Android)
++#elseif os(Androi)
+       initializedCount = addresses.withMemoryRebound(to: UnsafeMutableRawPointer.self) { addresses in
+         .init(clamping: backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))
+       }
+-#elseif os(Linux) || os(FreeBSD)
++#elseif os(Linux) || os(FreeBSD) || os(Android)
+       initializedCount = .init(clamping: backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))
+ #elseif os(Windows)
+       initializedCount = Int(clamping: RtlCaptureStackBackTrace(0, ULONG(clamping: addresses.count), addresses.baseAddress!, nil))

swift-android-testing-trunk.patch

@@ -0,0 +1,18 @@
+diff --git a/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift b/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
+index 78227e3..e0db2e9 100644
+--- a/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
++++ b/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
+@@ -65,11 +65,11 @@ public struct Backtrace: Sendable {
+       } else {
+         initializedCount = .init(clamping: backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))
+       }
+-#elseif os(Android)
++#elseif os(Androi)
+       initializedCount = addresses.withMemoryRebound(to: UnsafeMutableRawPointer.self) { addresses in
+         .init(clamping: backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))
+       }
+-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD)
++#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(Android)
+       initializedCount = .init(clamping: backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))
+ #elseif os(Windows)
+       initializedCount = Int(clamping: RtlCaptureStackBackTrace(0, ULONG(clamping: addresses.count), addresses.baseAddress!, nil))