From ac9721043334eade08b32d303edd5de0a3b85bd1 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 5 Nov 2020 21:34:59 +0000 Subject: [PATCH] Fix handling of test bundles with .wasm extension (#153) After https://github.com/apple/swift-package-manager/pull/3013 was merged and cherry-picked for our 5.3 snapshots (starting with `wasm-5.3-SNAPSHOT-2020-11-02-a`), `carton test` needs to handle the `.wasm` extension in test products. --- Sources/CartonHelpers/DefaultToolchain.swift | 2 +- Sources/SwiftToolchain/Toolchain.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/CartonHelpers/DefaultToolchain.swift b/Sources/CartonHelpers/DefaultToolchain.swift index a7f89ad..700c0e9 100644 --- a/Sources/CartonHelpers/DefaultToolchain.swift +++ b/Sources/CartonHelpers/DefaultToolchain.swift @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -public let defaultToolchainVersion = "wasm-5.3-SNAPSHOT-2020-10-29-c" +public let defaultToolchainVersion = "wasm-5.3-SNAPSHOT-2020-11-02-a" diff --git a/Sources/SwiftToolchain/Toolchain.swift b/Sources/SwiftToolchain/Toolchain.swift index 35af091..1fdd818 100644 --- a/Sources/SwiftToolchain/Toolchain.swift +++ b/Sources/SwiftToolchain/Toolchain.swift @@ -245,7 +245,7 @@ public final class Toolchain { let package = try self.package.get() let binPath = try inferBinPath(isRelease: isRelease) let testProductName = "\(package.name)PackageTests" - let testBundlePath = binPath.appending(component: "\(testProductName).xctest") + let testBundlePath = binPath.appending(component: "\(testProductName).wasm") terminal.logLookup("- test bundle to run: ", testBundlePath.pathString) terminal.write(