Skip to content

Exclude/fix certain tests for swift-evolve #21276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions test/SIL/Parser/array_roundtrip.swift
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
// RUN: %target-swift-frontend %s -emit-sil -Ounchecked | %target-sil-opt -assume-parsing-unqualified-ownership-sil

// FIXME: Fails if the positions of the two Collection subscript requirements
// are reversed. rdar://problem/46650834
// UNSUPPORTED: swift_evolve

var W = [UInt32](repeating: 0, count: 16)
1 change: 1 addition & 0 deletions test/SourceKit/DocSupport/doc_clang_module.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// REQUIRES: objc_interop
// UNSUPPORTED: swift_evolve

// FIXME: the test output we're comparing to is specific to macOS.
// REQUIRES-ANY: OS=macosx
Expand Down
14 changes: 7 additions & 7 deletions test/SourceKit/InterfaceGen/gen_stdlib.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ var x: Int

// Just check a small part, mainly to make sure we can print the interface of the stdlib.
// CHECK-STDLIB-NOT: extension _SwiftNSOperatingSystemVersion
// CHECK-STDLIB: struct Int : FixedWidthInteger, SignedInteger {
// CHECK-STDLIB: static var bitWidth: Int { get }
// CHECK-STDLIB: var nonzeroBitCount: Int { get }
// CHECK-STDLIB-LABEL: struct Int : FixedWidthInteger, SignedInteger {
// CHECK-STDLIB-DAG: static var bitWidth: Int { get }
// CHECK-STDLIB-DAG: var nonzeroBitCount: Int { get }
// CHECK-STDLIB: }

// Check that extensions of nested decls are showing up.
// CHECK-STDLIB-LABEL: extension String.Index {
// CHECK-STDLIB: func samePosition(in utf8: String.UTF8View) -> String.UTF8View.Index?
// CHECK-STDLIB: func samePosition(in characters: String) -> String.Index?
// CHECK-STDLIB: func samePosition(in unicodeScalars: String.UnicodeScalarView) -> String.UnicodeScalarIndex?
// CHECK-STDLIB-NEXT: }
// CHECK-STDLIB-DAG: func samePosition(in utf8: String.UTF8View) -> String.UTF8View.Index?
// CHECK-STDLIB-DAG: func samePosition(in characters: String) -> String.Index?
// CHECK-STDLIB-DAG: func samePosition(in unicodeScalars: String.UnicodeScalarView) -> String.UnicodeScalarIndex?
// CHECK-STDLIB: }

// CHECK-MUTATING-ATTR: mutating func

Expand Down
5 changes: 5 additions & 0 deletions test/api-digester/dump-module.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@
// RUN: diff -u %S/Outputs/cake.json %t.dump.json
// RUN: %api-digester -deserialize-sdk --input-paths %S/Outputs/cake-abi.json -o %t.dump.json
// RUN: diff -u %S/Outputs/cake-abi.json %t.dump.json

// The input JSON files need to be modified when standard library declarations
// are reordered. This is expected behavior and we simply shouldn't run the test
// when automatically evolving the standard library.
// UNSUPPORTED: swift_evolve
3 changes: 3 additions & 0 deletions test/api-digester/stability-stdlib-abi.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@
// RUN: %clang -E -P -x c %S/Outputs/stability-stdlib-abi.swift.expected -o - | sed '/^\s*$/d' | sort > %t.tmp/stability-stdlib-abi.swift.expected
// RUN: %clang -E -P -x c %t.tmp/changes.txt -o - | sed '/^\s*$/d' | sort > %t.tmp/changes.txt.tmp
// RUN: diff -u %t.tmp/stability-stdlib-abi.swift.expected %t.tmp/changes.txt.tmp

// FIXME: rdar://problem/46617463, rdar://problem/46618883
// UNSUPPORTED: swift_evolve
3 changes: 3 additions & 0 deletions test/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,9 @@ elif swift_test_subset == 'only_stress':
else:
lit_config.fatal("Unknown test mode %r" % swift_test_subset)

if lit_config.params.get('swift_evolve', None) is not None:
config.available_features.add("swift_evolve")

# Enable benchmark testing when the binary is found (has fully qualified path).
if config.benchmark_o != 'Benchmark_O':
config.available_features.add('benchmark')
Expand Down