Skip to content

Commit af65227

Browse files
authored
Merge pull request #69660 from apple/5.10-xcode-15-1-b2-test
[release/5.10] Support Xcode 15.1 Beta 2
2 parents 9402455 + 2357443 commit af65227

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

test/ClangImporter/Dispatch_test.swift

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %target-typecheck-verify-swift
22

3+
// REQUIRES: rdar112865148
4+
35
// REQUIRES: libdispatch
46
// UNSUPPORTED: OS=linux-gnu
57
// UNSUPPORTED: OS=linux-android

test/Concurrency/dispatch_inference.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ func testMe() {
2222
func testUnsafeSendableInMainAsync() async {
2323
var x = 5
2424
DispatchQueue.main.async {
25-
x = 17 // expected-error{{mutation of captured var 'x' in concurrently-executing code}}
25+
x = 17 // expected-warning{{mutation of captured var 'x' in concurrently-executing code}}
2626
}
2727
print(x)
2828
}
2929

3030
func testUnsafeSendableInAsync(queue: DispatchQueue) async {
3131
var x = 5
3232
queue.async {
33-
x = 17 // expected-error{{mutation of captured var 'x' in concurrently-executing code}}
33+
x = 17 // expected-warning{{mutation of captured var 'x' in concurrently-executing code}}
3434
}
3535

3636
queue.sync {

utils/build-presets.ini

+4-5
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@ install-llbuild
394394
install-swiftpm
395395
install-swift-driver
396396
install-swiftsyntax
397-
install-libcxx
398397

399398
[preset: buildbot_incremental,tools=RA,stdlib=RA,apple_silicon]
400399
mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
@@ -644,7 +643,6 @@ install-llbuild
644643
install-swiftpm
645644
install-swiftsyntax
646645
install-swift-driver
647-
install-libcxx
648646

649647
# We need to build the unittest extras so we can test
650648
build-swift-stdlib-unittest-extra
@@ -1603,7 +1601,6 @@ libcxx
16031601
install-llvm
16041602
install-swift
16051603
install-swiftsyntax
1606-
install-libcxx
16071604

16081605
# Build Playground support
16091606
playgroundsupport
@@ -1661,7 +1658,6 @@ install-llbuild
16611658
install-swiftpm
16621659
install-swift-driver
16631660
install-swiftsyntax
1664-
install-libcxx
16651661
install-swiftdocc
16661662

16671663
# Build the stress tester and SwiftEvolve
@@ -1687,6 +1683,10 @@ sil-verify-all-macos-only
16871683
skip-test-ios-host
16881684
skip-test-watchos-host
16891685

1686+
# Skip LLBuild test until GitHub issue is fixed:
1687+
# https://github.com/apple/swift-llbuild/issues/894
1688+
skip-test-llbuild
1689+
16901690
[preset: llvm_project_pull_request]
16911691
mixin-preset=buildbot_all_platforms,tools=RA,stdlib=RA
16921692

@@ -1741,7 +1741,6 @@ install-swift
17411741
install-llbuild
17421742
install-swiftpm
17431743
install-swiftsyntax
1744-
install-libcxx
17451744

17461745
skip-test-swift
17471746
skip-test-cmark

0 commit comments

Comments
 (0)