diff --git a/Docker/docker-compose.yaml b/Docker/docker-compose.yaml index 88af3c9..18e3832 100644 --- a/Docker/docker-compose.yaml +++ b/Docker/docker-compose.yaml @@ -25,7 +25,7 @@ services: test: <<: *common - command: /bin/bash -xcl "./Utilities/test.sh $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-}" + command: /bin/bash -xcl "swift test $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-}" # util diff --git a/Tests/SwiftSDKGeneratorTests/EndToEndTests.swift b/Tests/SwiftSDKGeneratorTests/EndToEndTests.swift index 513ac98..c839349 100644 --- a/Tests/SwiftSDKGeneratorTests/EndToEndTests.swift +++ b/Tests/SwiftSDKGeneratorTests/EndToEndTests.swift @@ -39,6 +39,8 @@ final class EndToEndTests: XCTestCase { #if !os(macOS) func testPackageInitExecutable() async throws { + throw XCTSkip("EndToEnd tests currently deadlock under `swift test`: https://github.com/swiftlang/swift-sdk-generator/issues/143") + let fm = FileManager.default var packageDirectory = FilePath(#filePath) @@ -102,6 +104,8 @@ final class EndToEndTests: XCTestCase { } func testRepeatedSDKBuilds() async throws { + throw XCTSkip("EndToEnd tests currently deadlock under `swift test`: https://github.com/swiftlang/swift-sdk-generator/issues/143") + let fm = FileManager.default var packageDirectory = FilePath(#filePath) diff --git a/Utilities/test.sh b/Utilities/test.sh deleted file mode 100755 index 0c34e4d..0000000 --- a/Utilities/test.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -##===----------------------------------------------------------------------===## -## -## This source file is part of the Swift open source project -## -## Copyright (c) YEARS Apple Inc. and the Swift project authors -## Licensed under Apache License v2.0 with Runtime Library Exception -## -## See https://swift.org/LICENSE.txt for license information -## See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors -## -##===----------------------------------------------------------------------===## - -set -ex - -if [ "$(uname)" = Darwin ]; then - swift test $@ -else - swift build --build-tests $@ -fi