diff --git a/test/ClangImporter/Dispatch_test.swift b/test/ClangImporter/Dispatch_test.swift index 31081489f890a..bc2d412889ff8 100644 --- a/test/ClangImporter/Dispatch_test.swift +++ b/test/ClangImporter/Dispatch_test.swift @@ -1,5 +1,7 @@ // RUN: %target-typecheck-verify-swift +// REQUIRES: rdar112865148 + // REQUIRES: libdispatch // UNSUPPORTED: OS=linux-gnu // UNSUPPORTED: OS=linux-android diff --git a/test/Concurrency/dispatch_inference.swift b/test/Concurrency/dispatch_inference.swift index aed28603d2576..4e751652c28ae 100644 --- a/test/Concurrency/dispatch_inference.swift +++ b/test/Concurrency/dispatch_inference.swift @@ -22,7 +22,7 @@ func testMe() { func testUnsafeSendableInMainAsync() async { var x = 5 DispatchQueue.main.async { - x = 17 // expected-error{{mutation of captured var 'x' in concurrently-executing code}} + x = 17 // expected-warning{{mutation of captured var 'x' in concurrently-executing code}} } print(x) } @@ -30,7 +30,7 @@ func testUnsafeSendableInMainAsync() async { func testUnsafeSendableInAsync(queue: DispatchQueue) async { var x = 5 queue.async { - x = 17 // expected-error{{mutation of captured var 'x' in concurrently-executing code}} + x = 17 // expected-warning{{mutation of captured var 'x' in concurrently-executing code}} } queue.sync { diff --git a/utils/build-presets.ini b/utils/build-presets.ini index d575960d70192..bd591736ec18f 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -394,7 +394,6 @@ install-llbuild install-swiftpm install-swift-driver install-swiftsyntax -install-libcxx [preset: buildbot_incremental,tools=RA,stdlib=RA,apple_silicon] mixin-preset=buildbot_incremental,tools=RA,stdlib=RA @@ -644,7 +643,6 @@ install-llbuild install-swiftpm install-swiftsyntax install-swift-driver -install-libcxx # We need to build the unittest extras so we can test build-swift-stdlib-unittest-extra @@ -1603,7 +1601,6 @@ libcxx install-llvm install-swift install-swiftsyntax -install-libcxx # Build Playground support playgroundsupport @@ -1661,7 +1658,6 @@ install-llbuild install-swiftpm install-swift-driver install-swiftsyntax -install-libcxx install-swiftdocc # Build the stress tester and SwiftEvolve @@ -1687,6 +1683,10 @@ sil-verify-all-macos-only skip-test-ios-host skip-test-watchos-host +# Skip LLBuild test until GitHub issue is fixed: +# https://github.com/apple/swift-llbuild/issues/894 +skip-test-llbuild + [preset: llvm_project_pull_request] mixin-preset=buildbot_all_platforms,tools=RA,stdlib=RA @@ -1741,7 +1741,6 @@ install-swift install-llbuild install-swiftpm install-swiftsyntax -install-libcxx skip-test-swift skip-test-cmark