Swift test fixes

zeroc-ice · Jan 24, 2025 · 446ce10 · 446ce10
1 parent 7a84154
commit 446ce10
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,8 +62,8 @@ jobs:
           # iOS
           - os: macos-15
             config: "ios"
-            build_flags: "PLATFORMS='macosx iphonesimulator' LANGUAGES='cpp swift' CONFIGS='static'"
-            test_flags: "--platform=iphonesimulator --controller-app --rfilter=swift/Ice/operations" # Remove rfilter once #3286 is fixed
+            build_flags: "PLATFORMS='macosx iphonesimulator' CONFIGS='static shared' LANGUAGES='cpp swift'"
+            test_flags: "--languages='cpp,swift' --platform=iphonesimulator --controller-app --rfilter=swift/Ice/operations" # Remove rfilter once #3286 is fixed
             build_cpp_and_python: true
 
           # Static builds

diff --git a/swift/test/Ice/udp/Client.swift b/swift/test/Ice/udp/Client.swift
@@ -17,7 +17,7 @@ class Client: TestHelperI {
             }
             try await allTests(self)
 
-            let num = restArgs.count == 4 ? Int(restArgs[3]) : 1
+            let num = restArgs.count == 1 ? Int(restArgs[0]) : 1
             for i in 0..<(num ?? 1) {
                 let prx = try communicator.stringToProxy(
                     "control:\(getTestEndpoint(num: Int32(i), prot: "tcp"))")!

diff --git a/swift/test/Ice/udp/Server.swift b/swift/test/Ice/udp/Server.swift
@@ -14,7 +14,7 @@ class Server: TestHelperI {
         defer {
             communicator.destroy()
         }
-        let num = restArgs.count == 4 ? Int32(restArgs[3]) : 1
+        let num = restArgs.count == 1 ? Int32(restArgs[0]) : 0
         communicator.getProperties().setProperty(
             key: "ControlAdapter.Endpoints",
             value: getTestEndpoint(num: num ?? 0, prot: "tcp"))

diff --git a/swift/test/TestDriver/main.swift b/swift/test/TestDriver/main.swift
@@ -19,7 +19,7 @@ do {
     let testName = "\(testPath).\(exe)"
 
     let testHelper = TestBundle.getTestHelper(name: testName)
-    try await testHelper.run(args: args)
+    try await testHelper.run(args: Array(args[3...]))
 
 } catch {
     for s in Thread.callStackSymbols {