From 5ef017f37b906eb822bec3af6515a364d0d170a4 Mon Sep 17 00:00:00 2001
From: "Jesse L. Zamora" <xtremekforever@gmail.com>
Date: Sat, 22 Feb 2025 13:38:46 -0500
Subject: [PATCH] Disable exit testing when building swift-testing on 6.1

---
 build-swift-testing.sh | 41 +++++++++++++++++++++++------------------
 build.sh               |  4 ++--
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/build-swift-testing.sh b/build-swift-testing.sh
index 506ce3c..188a3d8 100755
--- a/build-swift-testing.sh
+++ b/build-swift-testing.sh
@@ -7,26 +7,31 @@ mkdir -p $SWIFT_TESTING_BUILDDIR
 rm -rf $SWIFT_TESTING_INSTALL_PREFIX
 mkdir -p $SWIFT_TESTING_INSTALL_PREFIX
 
+# TODO: Remove this workaround once exit testing builds in 6.1 for armv7
+if [[ $SWIFT_VERSION == *"swift-6.1"* ]]; then
+    SWIFTC_FLAGS="${SWIFTC_FLAGS} -D SWT_NO_EXIT_TESTS"
+fi
+
 echo "Configure swift-testing"
 rm -rf $SWIFT_TESTING_BUILDDIR/CMakeCache.txt
 LIBS="-latomic" cmake -S $SWIFT_TESTING_SRCDIR -B $SWIFT_TESTING_BUILDDIR -G Ninja \
-        -DCMAKE_INSTALL_PREFIX=${SWIFT_TESTING_INSTALL_PREFIX} \
-        -DBUILD_SHARED_LIBS=ON \
-        -DCMAKE_BUILD_TYPE=${SWIFT_BUILD_CONFIGURATION} \
-        -DCMAKE_C_COMPILER=${SWIFT_NATIVE_PATH}/clang \
-        -DCMAKE_CXX_COMPILER=${SWIFT_NATIVE_PATH}/clang++ \
-        -DCMAKE_C_FLAGS="${RUNTIME_FLAGS}" \
-        -DCMAKE_CXX_FLAGS="${RUNTIME_FLAGS}" \
-        -DCMAKE_C_LINK_FLAGS="${LINK_FLAGS}" \
-        -DCMAKE_CXX_LINK_FLAGS="${LINK_FLAGS}" \
-        -DCMAKE_TOOLCHAIN_FILE="${CROSS_TOOLCHAIN_FILE}" \
-        -DCF_DEPLOYMENT_SWIFT=ON \
-        -DCMAKE_Swift_COMPILER=${SWIFT_NATIVE_PATH}/swiftc \
-        -DCMAKE_Swift_FLAGS="${SWIFTC_FLAGS}" \
-        -DCMAKE_Swift_FLAGS_DEBUG="" \
-        -DCMAKE_Swift_FLAGS_RELEASE="" \
-        -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \
-        -DSwiftTesting_MACRO="${SWIFT_NATIVE_PATH}/../lib/swift/host/plugins/libTestingMacros.so" \
+    -DCMAKE_INSTALL_PREFIX=${SWIFT_TESTING_INSTALL_PREFIX} \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_BUILD_TYPE=${SWIFT_BUILD_CONFIGURATION} \
+    -DCMAKE_C_COMPILER=${SWIFT_NATIVE_PATH}/clang \
+    -DCMAKE_CXX_COMPILER=${SWIFT_NATIVE_PATH}/clang++ \
+    -DCMAKE_C_FLAGS="${RUNTIME_FLAGS}" \
+    -DCMAKE_CXX_FLAGS="${RUNTIME_FLAGS}" \
+    -DCMAKE_C_LINK_FLAGS="${LINK_FLAGS}" \
+    -DCMAKE_CXX_LINK_FLAGS="${LINK_FLAGS}" \
+    -DCMAKE_TOOLCHAIN_FILE="${CROSS_TOOLCHAIN_FILE}" \
+    -DCF_DEPLOYMENT_SWIFT=ON \
+    -DCMAKE_Swift_COMPILER=${SWIFT_NATIVE_PATH}/swiftc \
+    -DCMAKE_Swift_FLAGS="${SWIFTC_FLAGS}" \
+    -DCMAKE_Swift_FLAGS_DEBUG="" \
+    -DCMAKE_Swift_FLAGS_RELEASE="" \
+    -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \
+    -DSwiftTesting_MACRO="${SWIFT_NATIVE_PATH}/../lib/swift/host/plugins/libTestingMacros.so" \
 
 echo "Build swift-testing"
 (cd $SWIFT_TESTING_BUILDDIR && ninja)
@@ -34,5 +39,5 @@ echo "Build swift-testing"
 echo "Install swift-testing"
 (cd $SWIFT_TESTING_BUILDDIR && ninja install)
 
-echo "Install swift-testing to sysroot"
+echo "Install Testing to sysroot"
 cp -rf ${SWIFT_TESTING_INSTALL_PREFIX}/* ${STAGING_DIR}/usr/
diff --git a/build.sh b/build.sh
index 40e89d4..a9e8ca2 100755
--- a/build.sh
+++ b/build.sh
@@ -35,8 +35,8 @@ rm -rf $STAGING_DIR/usr/lib/swift*
 ./build-foundation.sh
 ./build-xctest.sh
 
-# NOTE: Swift-testing is disabled in 6.1 since it fails to compile
-if [[ $SWIFT_VERSION == *"6.0"* ]] || [[ $SWIFT_VERSION == *"swift-DEVELOPMENT"* ]]; then
+# Enable Swift Testing for 6.0 and later
+if [[ $SWIFT_VERSION == *"swift-6."* ]] || [[ $SWIFT_VERSION == *"swift-DEVELOPMENT"* ]]; then
     ./build-swift-testing.sh
 fi