Skip to content

Commit 987756c

Browse files
authored
Merge pull request #69482 from apple/xcode-15-1-b2-test
[main] Support Xcode 15.1 Beta 2
2 parents 6767774 + 8d165df commit 987756c

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

test/ClangImporter/Dispatch_test.swift

Lines changed: 2 additions & 0 deletions
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/ClangImporter/SceneKit_test.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
// REQUIRES: objc_interop
44
// REQUIRES: OS=macosx
55

6-
// SceneKit has two protocols sections, which clang treats as an error now
7-
// rdar://113874614
8-
// XFAIL: *
9-
106
import SceneKit
117
import Foundation
128

test/Concurrency/dispatch_inference.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// RUN: %target-swift-frontend -disable-availability-checking %import-libdispatch -strict-concurrency=complete %s -emit-sil -o /dev/null -verify -strict-concurrency=complete
44
// RUN: %target-swift-frontend -disable-availability-checking %import-libdispatch -strict-concurrency=complete %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-experimental-feature RegionBasedIsolation
55

6+
// https://github.com/apple/swift/issues/69481
7+
// REQUIRES: GH69481
68
// REQUIRES: concurrency
79
// REQUIRES: libdispatch
810
// REQUIRES: asserts
@@ -22,15 +24,15 @@ func testMe() {
2224
func testUnsafeSendableInMainAsync() async {
2325
var x = 5
2426
DispatchQueue.main.async {
25-
x = 17 // expected-error{{mutation of captured var 'x' in concurrently-executing code}}
27+
x = 17 // expected-warning{{mutation of captured var 'x' in concurrently-executing code}}
2628
}
2729
print(x)
2830
}
2931

3032
func testUnsafeSendableInAsync(queue: DispatchQueue) async {
3133
var x = 5
3234
queue.async {
33-
x = 17 // expected-error{{mutation of captured var 'x' in concurrently-executing code}}
35+
x = 17 // expected-warning{{mutation of captured var 'x' in concurrently-executing code}}
3436
}
3537

3638
queue.sync {

utils/build-presets.ini

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ install-llbuild
396396
install-swiftpm
397397
install-swift-driver
398398
install-swiftsyntax
399-
install-libcxx
400399

401400
[preset: buildbot_incremental,tools=RA,stdlib=RA,apple_silicon]
402401
mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
@@ -604,7 +603,6 @@ install-llbuild
604603
install-swiftpm
605604
install-swiftsyntax
606605
install-swift-driver
607-
install-libcxx
608606

609607
# We need to build the unittest extras so we can test
610608
build-swift-stdlib-unittest-extra
@@ -1564,7 +1562,6 @@ libcxx
15641562
install-llvm
15651563
install-swift
15661564
install-swiftsyntax
1567-
install-libcxx
15681565

15691566
# Build Playground support
15701567
playgroundsupport
@@ -1622,7 +1619,6 @@ install-llbuild
16221619
install-swiftpm
16231620
install-swift-driver
16241621
install-swiftsyntax
1625-
install-libcxx
16261622
install-swiftdocc
16271623

16281624
# Build the stress tester
@@ -1647,6 +1643,10 @@ sil-verify-all-macos-only
16471643
skip-test-ios-host
16481644
skip-test-watchos-host
16491645

1646+
# Skip LLBuild test until GitHub issue is fixed:
1647+
# https://github.com/apple/swift-llbuild/issues/894
1648+
skip-test-llbuild
1649+
16501650
[preset: llvm_project_pull_request]
16511651
mixin-preset=buildbot_all_platforms,tools=RA,stdlib=RA
16521652

@@ -1701,7 +1701,6 @@ install-swift
17011701
install-llbuild
17021702
install-swiftpm
17031703
install-swiftsyntax
1704-
install-libcxx
17051704

17061705
skip-test-swift
17071706

0 commit comments

Comments
 (0)