Run the linux NIO tests on the macOS emulator and vice versa

Author: finagolfin

.github/workflows/sdks.yml

@@ -303,31 +303,6 @@ jobs:
           echo "SWIFTPM_X_FLAGS=${XFLAGS}" >> $GITHUB_ENV
           AFLAGS="--swift-sdk armv7-unknown-linux-androideabi${ANDROID_API_LEVEL} ${FLAGS}"
           echo "SWIFTPM_ARM_FLAGS=${AFLAGS}" >> $GITHUB_ENV
-      - name: Get Swift Argument Parser package
-        uses: actions/checkout@v4
-        with:
-          repository: apple/swift-argument-parser
-          path: swift-argument-parser
-      - name: Build Swift Argument Parser package
-        run: |
-          cd swift-argument-parser
-          rm Examples/count-lines/CountLines.swift Tools/changelog-authors/*.swift
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_ARM_FLAGS}
-      - name: Get Swift crypto package
-        uses: actions/checkout@v4
-        with:
-          repository: apple/swift-crypto
-          path: swift-crypto
-      - name: Build Swift crypto package
-        run: |
-          cd swift-crypto
-          perl -pi -e 's%\\\\(testsDirectory)/.*Vectors%/data/local/tmp/pack/crypto-vectors%' Tests/{Crypto,_CryptoExtras}Tests/Utils/{RFCVector,Wycheproof}.swift
-          perl -pi -e 's%#file%"/data/local/tmp/pack/crypto-vectors"%;s%../_CryptoExtrasVectors/%%' Tests/_CryptoExtrasTests/TestRSABlindSigning.swift
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_ARM_FLAGS}
       - name: Get Swift NIO package
         uses: actions/checkout@v4
         with:
@@ -336,109 +311,7 @@ jobs:
       - name: Build Swift NIO package
         run: |
           cd swift-nio
-          git apply ../sdk-config/swift-nio-disable-ecn-tests.patch ../sdk-config/swift-nio-filesystem.patch
-          if ${{ startsWith(matrix.os, 'macos') }}; then
-            git apply -R ../sdk-config/swift-nio-revert-async.patch
-          fi
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_ARM_FLAGS}
-      - name: Get Swift Numerics package
-        uses: actions/checkout@v4
-        with:
-          repository: apple/swift-numerics
-          path: swift-numerics
-      - name: Build Swift Numerics package
-        run: |
-          cd swift-numerics
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_ARM_FLAGS}
-      - name: Get Swift System package
-        uses: actions/checkout@v4
-        with:
-          repository: apple/swift-system
-          path: swift-system
-      - name: Build Swift System package
-        run: |
-          git apply sdk-config/swift-system-tests.patch
-          cd swift-system
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_ARM_FLAGS}
-      - name: Get Swift Collections package
-        uses: actions/checkout@v4
-        with:
-          repository: apple/swift-collections
-          path: swift-collections
-      - name: Build Swift Collections package
-        run: |
-          cd swift-collections
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_ARM_FLAGS}
-      - name: Get Swift Atomics package
-        uses: actions/checkout@v4
-        with:
-          repository: apple/swift-atomics
-          path: swift-atomics
-          ref: 1.2.0
-      - name: Get Swift NIO SSH package
-        uses: actions/checkout@v4
-        with:
-          repository: apple/swift-nio-ssh
-          path: sns
-      - name: Build Swift NIO SSH package
-        run: |
-          cd sns
-          perl -pi -e 's%url: .*swift-([a-z]*)\.git.*$%path: \"../swift-\1\"),%g' Package.swift
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_ARM_FLAGS}
-      - name: Get Swift NIO SSL package
-        uses: actions/checkout@v4
-        with:
-          repository: apple/swift-nio-ssl
-          path: snl
-      - name: Build Swift NIO SSL package
-        run: |
-          cd snl
-          git apply ../sdk-config/swift-nio-ssl-test.patch
-          SWIFTCI_USE_LOCAL_DEPS=1 ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
-          SWIFTCI_USE_LOCAL_DEPS=1 ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
-          SWIFTCI_USE_LOCAL_DEPS=1 ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_ARM_FLAGS}
-      - name: Get Yams package
-        uses: actions/checkout@v4
-        with:
-          repository: jpsim/Yams
-          path: yams
-      - name: Build Yams package
-        run: |
-          cd yams
-          perl -pi -e 's% fixturesDirectory + \"/SourceKitten#289% \"/data/local/tmp/pack%' Tests/YamsTests/PerformanceTests.swift
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_ARM_FLAGS}
-      - name: Get Swift NIO HTTP/2 package
-        uses: actions/checkout@v4
-        with:
-          repository: apple/swift-nio-http2
-          path: snh
-      - name: Build Swift NIO HTTP/2 package
-        run: |
-          cd snh
-          perl -pi -e 's%url: .*swift-([a-z]*)\.git.*$%path: \"../swift-\1\"),%g' Package.swift
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
-          ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
-      - name: Get Swift Algorithms package
-        uses: actions/checkout@v4
-        with:
-          repository: apple/swift-algorithms
-          path: sa
-      - name: Build Swift Algorithms package
-        run: |
-          cd sa
-          perl -pi -e 's%url: .*$%path: \"../swift-numerics\"),%' Package.swift
+          git apply ../sdk-config/swift-nio-disable-ecn-tests.patch ../sdk-config/swift-nio-filesystem.patch ../sdk-config/swift-nio-debug-async.patch
           ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_AARCH_FLAGS}
           ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_X_FLAGS}
           ${TOOLCHAIN}/bin/swift build --build-tests ${SWIFTPM_ARM_FLAGS}
@@ -464,56 +337,15 @@ jobs:
           adb shell "run-as com.termux ln -s README.md /data/data/com.termux/pack/Test\ Data/README.md.symlink"
           adb shell "run-as com.termux ln -s Foo /data/data/com.termux/pack/Test\ Data/Foo.symlink"
           adb shell "run-as com.termux sh -c 'TMPDIR=/data/data/com.termux /data/data/com.termux/pack/swift-nioPackageTests.xctest'"
-          adb shell "TMPDIR=/data/local/tmp /data/local/tmp/pack/swift-systemPackageTests.xctest"
           EOF
 
           mkdir pack
           TARGET="x86_64-unknown-linux-android$ANDROID_API_LEVEL"
 
-          cp swift-argument-parser/.build/$TARGET/debug/{generate-manual,math,repeat,roll,swift-argument-parserPackageTests.xctest} pack
-          echo 'adb shell /data/local/tmp/pack/swift-argument-parserPackageTests.xctest' >> ~/test-toolchain.sh
-
-          wget -q https://raw.githubusercontent.com/termux/termux-elf-cleaner/v2.1.1/elf-cleaner.cpp
-          wget -q https://raw.githubusercontent.com/termux/termux-elf-cleaner/v2.1.1/elf.h
-          wget -q https://raw.githubusercontent.com/termux/termux-elf-cleaner/v2.1.1/arghandling.h
-          wget -q https://raw.githubusercontent.com/termux/termux-elf-cleaner/v2.1.1/arghandling.c
-          clang -c arghandling.c
-          clang -o elf-cleaner arghandling.o elf-cleaner.cpp -DCOPYRIGHT=\"foo\" -DPACKAGE_NAME=\"termux-elf-cleaner\" -DPACKAGE_VERSION=\"2.2.1\"
-          ./elf-cleaner --api-level $ANDROID_API_LEVEL pack/{generate-manual,math,repeat,roll} || true
-
-          cp swift-crypto/.build/$TARGET/debug/swift-cryptoPackageTests.xctest pack
-          echo 'adb shell /data/local/tmp/pack/swift-cryptoPackageTests.xctest' >> ~/test-toolchain.sh
-
           cp swift-nio/.build/$TARGET/debug/swift-nioPackageTests.xctest pack
 
-          cp swift-numerics/.build/$TARGET/debug/swift-numericsPackageTests.xctest pack
-          echo 'adb shell /data/local/tmp/pack/swift-numericsPackageTests.xctest' >> ~/test-toolchain.sh
-
-          cp swift-system/.build/$TARGET/debug/swift-systemPackageTests.xctest pack
-          cp swift-collections/.build/$TARGET/debug/swift-collectionsPackageTests.xctest pack
-          echo 'adb shell /data/local/tmp/pack/swift-collectionsPackageTests.xctest' >> ~/test-toolchain.sh
-
-          cp sns/.build/$TARGET/debug/swift-nio-sshPackageTests.xctest pack
-          echo 'adb shell /data/local/tmp/pack/swift-nio-sshPackageTests.xctest' >> ~/test-toolchain.sh
-
-          cp snl/.build/$TARGET/debug/swift-nio-sslPackageTests.xctest pack
-          echo 'adb shell /data/local/tmp/pack/swift-nio-sslPackageTests.xctest' >> ~/test-toolchain.sh
-
-          cp snh/.build/$TARGET/debug/swift-nio-http2PackageTests.xctest pack
-          echo 'adb shell /data/local/tmp/pack/swift-nio-http2PackageTests.xctest' >> ~/test-toolchain.sh
-
-          cp yams/.build/$TARGET/debug/YamsPackageTests.xctest pack
-          echo 'adb shell /data/local/tmp/pack/YamsPackageTests.xctest' >> ~/test-toolchain.sh
-
-          cp sa/.build/$TARGET/debug/swift-algorithmsPackageTests.xctest pack
-          echo 'adb shell /data/local/tmp/pack/swift-algorithmsPackageTests.xctest' >> ~/test-toolchain.sh
-
-          mkdir pack/crypto-vectors pack/swift-crypto_CryptoTests.resources
-          cp swift-crypto/Tests/Test\ Vectors/* swift-crypto/Tests/_CryptoExtrasVectors/* pack/crypto-vectors
-          cp swift-crypto/Tests/CryptoTests/HPKE/hpke-test-vectors.json pack/swift-crypto_CryptoTests.resources
           rm swift-nio/Tests/NIOFileSystemIntegrationTests/Test\ Data/*symlink
           cp -r swift-nio/Tests/NIOFileSystemIntegrationTests/Test\ Data/ swift-nio/Tests/NIOFileSystemIntegrationTests/FileHandleTests.swift pack
-          cp yams/Tests/YamsTests/Fixtures/SourceKitten#289/debug.yaml pack
           cp ~/.${{ startsWith(matrix.os, 'ubuntu') && 'config/' || '' }}swiftpm/swift-sdks/${{ steps.version.outputs.tag }}-android-${ANDROID_API_LEVEL}-*.artifactbundle/swift*sdk/android*sysroot/usr/lib/x86_64-linux-android/lib*so pack
 
           # need to free up some space or else the emulator fails to launch:
@@ -525,6 +357,30 @@ jobs:
           echo "TEST SCRIPT:"
           cat ~/test-toolchain.sh
 
+          mv ~/{termux-debug.apk,test-toolchain.sh} pack
+          tar cvf pack.tar pack
+      - name: Upload test directory tarfile
+        uses: actions/upload-artifact@v4
+        with:
+          name: sdk-tests-${{ matrix.version }}-${{ matrix.os }}
+          path: pack.tar
+  run-tests-on-android-x86_64-emulator:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [release, devel, trunk]
+        os: [ubuntu-24.04, macos-13]
+    needs: bundle-tests
+    steps:
+      - name: Download test directory tarfile
+        uses: actions/download-artifact@v4
+        with:
+          name: sdk-tests-${{ matrix.version }}-${{ startsWith(matrix.os, 'ubuntu') && 'macos-13' || 'ubuntu-24.04' }}
+      - name: Unpack tests for Android x86_64 emulator
+        run: |
+          tar xf pack.tar
+          mv pack/{termux-debug.apk,test-toolchain.sh} ~
           if ${{ startsWith(matrix.os, 'ubuntu') }}; then
             echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
             sudo udevadm control --reload-rules
@@ -534,6 +390,6 @@ jobs:
       - name: Run tests on Android x86_64 emulator
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: ${{ matrix.version == 'release' && '29' || env.ANDROID_API_LEVEL }}
+          api-level: ${{ matrix.version == 'release' && '29' || '24' }}
           arch: x86_64
           script: ~/test-toolchain.sh

swift-nio-debug-async.patch

@@ -0,0 +1,68 @@
+diff --git a/Tests/NIOCoreTests/AsyncSequences/NIOAsyncWriterTests.swift b/Tests/NIOCoreTests/AsyncSequences/NIOAsyncWriterTests.swift
+index 848c65f8..2c4186fc 100644
+--- a/Tests/NIOCoreTests/AsyncSequences/NIOAsyncWriterTests.swift
++++ b/Tests/NIOCoreTests/AsyncSequences/NIOAsyncWriterTests.swift
+@@ -612,42 +612,63 @@ final class NIOAsyncWriterTests: XCTestCase {
+         let bothSuspended = expectation(description: "suspended on both yields")
+         let suspendedAgain = ConditionLock(value: false)
+         self.delegate.didSuspendHandler = {
++print("inside suspendHandler: \(ContinuousClock.now)\n")
+             if self.delegate.didSuspendCallCount == 2 {
++print("inside suspendHandler before fulfil: \(ContinuousClock.now)\n")
+                 bothSuspended.fulfill()
+             } else if self.delegate.didSuspendCallCount > 2 {
++print("inside suspendHandler before lock: \(ContinuousClock.now)\n")
+                 suspendedAgain.lock()
+                 suspendedAgain.unlock(withValue: true)
++print("inside suspendHandler after unlock: \(ContinuousClock.now)\n")
+             }
+         }
+ 
+         self.delegate.didYieldHandler = { _ in
++print("inside yieldHandler: \(ContinuousClock.now)\n")
+             if self.delegate.didYieldCallCount == 1 {
++print("inside yieldHandler before lock: \(ContinuousClock.now)\n")
+                 // Delay this yield until the other yield is suspended again.
+                 suspendedAgain.lock(whenValue: true)
+                 suspendedAgain.unlock()
++print("inside yieldHandler after unlock: \(ContinuousClock.now)\n")
+             }
+         }
+ 
++print("before running tasks: \(ContinuousClock.now)\n")
+         let task1 = Task { [writer] in
++print("inside task1: \(ContinuousClock.now)\n")
+             try await writer!.yield("message1")
++print("inside task1 after yield: \(ContinuousClock.now)\n")
+         }
++print("before running task2: \(ContinuousClock.now)\n")
+         let task2 = Task { [writer] in
++print("inside task2: \(ContinuousClock.now)\n")
+             try await writer!.yield("message2")
++print("inside task2 after yield: \(ContinuousClock.now)\n")
+         }
+ 
++print("after running tasks: \(ContinuousClock.now)\n")
+         await fulfillment(of: [bothSuspended], timeout: 1)
++print("after awaiting fulfillment: \(ContinuousClock.now)\n")
+         self.writer.finish()
+ 
++print("before assert on both suspended: \(ContinuousClock.now)\n")
+         self.assert(suspendCallCount: 2, yieldCallCount: 0, terminateCallCount: 0)
+ 
++print("before setting write to true: \(ContinuousClock.now)\n")
+         // We have to become writable again to unbuffer the yields
+         // The first call to didYield will pause, so that the other yield will be suspended again.
+         self.sink.setWritability(to: true)
+ 
++print("before awaiting tasks: \(ContinuousClock.now)\n")
+         await XCTAssertNoThrow(try await task1.value)
++print("before awaiting task2: \(ContinuousClock.now)\n")
+         await XCTAssertNoThrow(try await task2.value)
+ 
++print("after awaiting tasks: \(ContinuousClock.now)\n")
+         self.assert(suspendCallCount: 3, yieldCallCount: 2, terminateCallCount: 1)
++print("after final assert: \(ContinuousClock.now)\n")
+     }
+ 
+     func testWriterFinish_whenFinished() {