Skip to content

Commit e3aa53c

Browse files
slavapestovslavapestov
authored
Merge pull request #17689 from slavapestov/nuke-swift3-tests
Nuke more Swift 3 tests
2 parents d6dad24 + 31ab93b commit e3aa53c

File tree

79 files changed

+23
-4673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+23
-4673
lines changed

‎test/APINotes/obsoleted.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// RUN: not %target-swift-frontend -typecheck -verify -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks -swift-version 3 %s
21
// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks -swift-version 4.2 %s
32
// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks -swift-version 5 %s
43
// REQUIRES: objc_interop

‎test/APINotes/versioned-multi.swift

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,11 @@
11
// RUN: %empty-directory(%t)
22

3-
// RUN: %target-swift-ide-test -F %S/Inputs/custom-frameworks -print-module -source-filename %s -module-to-print=APINotesFrameworkTest -function-definitions=false -print-regular-comments -swift-version 3 | %FileCheck -check-prefix=CHECK-SWIFT-3 %s
4-
53
// RUN: %target-swift-ide-test -F %S/Inputs/custom-frameworks -print-module -source-filename %s -module-to-print=APINotesFrameworkTest -function-definitions=false -swift-version 4 | %FileCheck -check-prefix=CHECK-SWIFT-4 %s
64

75
// RUN: %target-swift-ide-test -F %S/Inputs/custom-frameworks -print-module -source-filename %s -module-to-print=APINotesFrameworkTest -function-definitions=false -swift-version 4.2 | %FileCheck -check-prefix=CHECK-SWIFT-4-2 %s
86

97
// RUN: %target-swift-ide-test -F %S/Inputs/custom-frameworks -print-module -source-filename %s -module-to-print=APINotesFrameworkTest -function-definitions=false -swift-version 5 | %FileCheck -check-prefix=CHECK-SWIFT-5 %s
108

11-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4_4")
12-
// CHECK-SWIFT-3: var multiVersionedGlobal4: Int32
13-
// CHECK-SWIFT-3: var multiVersionedGlobal4_4: Int32
14-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4Notes_4")
15-
// CHECK-SWIFT-3: var multiVersionedGlobal4Notes: Int32
16-
// CHECK-SWIFT-3: var multiVersionedGlobal4Notes_4: Int32
17-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal4Notes_4")
18-
// CHECK-SWIFT-3: var multiVersionedGlobal4Notes_NEW: Int32
19-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4Header_4")
20-
// CHECK-SWIFT-3: var multiVersionedGlobal4Header: Int32
21-
// CHECK-SWIFT-3: var multiVersionedGlobal4Header_4: Int32
22-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal4Header_4")
23-
// CHECK-SWIFT-3: var multiVersionedGlobal4Header_NEW: Int32
24-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4Both_4")
25-
// CHECK-SWIFT-3: var multiVersionedGlobal4Both: Int32
26-
// CHECK-SWIFT-3: var multiVersionedGlobal4Both_4: Int32
27-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal4Both_4")
28-
// CHECK-SWIFT-3: var multiVersionedGlobal4Both_NEW: Int32
29-
30-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34_3")
31-
// CHECK-SWIFT-3: var multiVersionedGlobal34: Int32
32-
// CHECK-SWIFT-3: var multiVersionedGlobal34_3: Int32
33-
// CHECK-SWIFT-3: @available(swift, introduced: 4, renamed: "multiVersionedGlobal34_3")
34-
// CHECK-SWIFT-3: var multiVersionedGlobal34_4: Int32
35-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34Notes_3")
36-
// CHECK-SWIFT-3: var multiVersionedGlobal34Notes: Int32
37-
// CHECK-SWIFT-3: var multiVersionedGlobal34Notes_3: Int32
38-
// CHECK-SWIFT-3: @available(swift, introduced: 4, renamed: "multiVersionedGlobal34Notes_3")
39-
// CHECK-SWIFT-3: var multiVersionedGlobal34Notes_4: Int32
40-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal34Notes_3")
41-
// CHECK-SWIFT-3: var multiVersionedGlobal34Notes_NEW: Int32
42-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34Header_3")
43-
// CHECK-SWIFT-3: var multiVersionedGlobal34Header: Int32
44-
// CHECK-SWIFT-3: var multiVersionedGlobal34Header_3: Int32
45-
// CHECK-SWIFT-3: @available(swift, introduced: 4, renamed: "multiVersionedGlobal34Header_3")
46-
// CHECK-SWIFT-3: var multiVersionedGlobal34Header_4: Int32
47-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal34Header_3")
48-
// CHECK-SWIFT-3: var multiVersionedGlobal34Header_NEW: Int32
49-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34Both_3")
50-
// CHECK-SWIFT-3: var multiVersionedGlobal34Both: Int32
51-
// CHECK-SWIFT-3: var multiVersionedGlobal34Both_3: Int32
52-
// CHECK-SWIFT-3: @available(swift, introduced: 4, renamed: "multiVersionedGlobal34Both_3")
53-
// CHECK-SWIFT-3: var multiVersionedGlobal34Both_4: Int32
54-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal34Both_3")
55-
// CHECK-SWIFT-3: var multiVersionedGlobal34Both_NEW: Int32
56-
57-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal45_4")
58-
// CHECK-SWIFT-3: var multiVersionedGlobal45: Int32
59-
// CHECK-SWIFT-3: var multiVersionedGlobal45_4: Int32
60-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal45_4")
61-
// CHECK-SWIFT-3: var multiVersionedGlobal45_5: Int32
62-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal45Notes_4")
63-
// CHECK-SWIFT-3: var multiVersionedGlobal45Notes: Int32
64-
// CHECK-SWIFT-3: var multiVersionedGlobal45Notes_4: Int32
65-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal45Notes_4")
66-
// CHECK-SWIFT-3: var multiVersionedGlobal45Notes_5: Int32
67-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal45Header_4")
68-
// CHECK-SWIFT-3: var multiVersionedGlobal45Header: Int32
69-
// CHECK-SWIFT-3: var multiVersionedGlobal45Header_4: Int32
70-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal45Header_4")
71-
// CHECK-SWIFT-3: var multiVersionedGlobal45Header_5: Int32
72-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal45Both_4")
73-
// CHECK-SWIFT-3: var multiVersionedGlobal45Both: Int32
74-
// CHECK-SWIFT-3: var multiVersionedGlobal45Both_4: Int32
75-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal45Both_4")
76-
// CHECK-SWIFT-3: var multiVersionedGlobal45Both_5: Int32
77-
78-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal345_3")
79-
// CHECK-SWIFT-3: var multiVersionedGlobal345: Int32
80-
// CHECK-SWIFT-3: var multiVersionedGlobal345_3: Int32
81-
// CHECK-SWIFT-3: @available(swift, introduced: 4, renamed: "multiVersionedGlobal345_3")
82-
// CHECK-SWIFT-3: var multiVersionedGlobal345_4: Int32
83-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal345_3")
84-
// CHECK-SWIFT-3: var multiVersionedGlobal345_5: Int32
85-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal345Notes_3")
86-
// CHECK-SWIFT-3: var multiVersionedGlobal345Notes: Int32
87-
// CHECK-SWIFT-3: var multiVersionedGlobal345Notes_3: Int32
88-
// CHECK-SWIFT-3: @available(swift, introduced: 4, renamed: "multiVersionedGlobal345Notes_3")
89-
// CHECK-SWIFT-3: var multiVersionedGlobal345Notes_4: Int32
90-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal345Notes_3")
91-
// CHECK-SWIFT-3: var multiVersionedGlobal345Notes_5: Int32
92-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal345Header_3")
93-
// CHECK-SWIFT-3: var multiVersionedGlobal345Header: Int32
94-
// CHECK-SWIFT-3: var multiVersionedGlobal345Header_3: Int32
95-
// CHECK-SWIFT-3: @available(swift, introduced: 4, renamed: "multiVersionedGlobal345Header_3")
96-
// CHECK-SWIFT-3: var multiVersionedGlobal345Header_4: Int32
97-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal345Header_3")
98-
// CHECK-SWIFT-3: var multiVersionedGlobal345Header_5: Int32
99-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal345Both_3")
100-
// CHECK-SWIFT-3: var multiVersionedGlobal345Both: Int32
101-
// CHECK-SWIFT-3: var multiVersionedGlobal345Both_3: Int32
102-
// CHECK-SWIFT-3: @available(swift, introduced: 4, renamed: "multiVersionedGlobal345Both_3")
103-
// CHECK-SWIFT-3: var multiVersionedGlobal345Both_4: Int32
104-
// CHECK-SWIFT-3: @available(swift, introduced: 5, renamed: "multiVersionedGlobal345Both_3")
105-
// CHECK-SWIFT-3: var multiVersionedGlobal345Both_5: Int32
106-
// CHECK-SWIFT-3: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal34_4_2_not_5")
107-
// CHECK-SWIFT-3: var multiVersionedGlobal34_4_2: Int32
108-
// CHECK-SWIFT-3: var multiVersionedGlobal34_4_2_not_5: Int32
109-
1109

11110
// CHECK-SWIFT-4: @available(swift, obsoleted: 3, renamed: "multiVersionedGlobal4_4")
11211
// CHECK-SWIFT-4: var multiVersionedGlobal4: Int32

‎test/ClangImporter/availability_open_enums_swift3.swift

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎test/ClangImporter/clang_builtins.swift

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// RUN: not %target-swift-frontend -swift-version 3 -typecheck %s 2> %t.3.txt
2-
// RUN: %FileCheck -check-prefix=CHECK-3 -check-prefix=CHECK-%target-runtime-3 %s < %t.3.txt
3-
// RUN: not %target-swift-frontend -swift-version 4 -typecheck %s 2> %t.4.txt
4-
// RUN: %FileCheck -check-prefix=CHECK-4 -check-prefix=CHECK-%target-runtime-4 %s < %t.4.txt
1+
// RUN: not %target-swift-frontend -swift-version 4 -typecheck %s 2>&1 | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-%target-runtime %s
52

63
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
74
import Darwin
@@ -13,38 +10,31 @@
1310

1411
func test() {
1512
let _: Int = strxfrm
16-
// CHECK-3: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> UInt'{{( [(]aka .+[)])?}} to specified type 'Int'
17-
// CHECK-4: [[@LINE-2]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
13+
// CHECK: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
1814

1915
let _: Int = strcspn
20-
// CHECK-3: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> UInt'{{( [(]aka .+[)])?}} to specified type 'Int'
21-
// CHECK-4: [[@LINE-2]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
16+
// CHECK: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
2217

2318
let _: Int = strspn
24-
// CHECK-3: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> UInt'{{( [(]aka .+[)])?}} to specified type 'Int'
25-
// CHECK-4: [[@LINE-2]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
19+
// CHECK: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
2620

2721
let _: Int = strlen
28-
// CHECK-3: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> UInt'{{( [(]aka .+[)])?}} to specified type 'Int'
29-
// CHECK-4: [[@LINE-2]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
22+
// CHECK: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
3023
}
3124

3225
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
3326
// These functions aren't consistently available across platforms, so only
3427
// test for them on Apple platforms.
3528
func testApple() {
3629
let _: Int = strlcpy
37-
// CHECK-objc-3: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> UInt'{{( [(]aka .+[)])?}} to specified type 'Int'
38-
// CHECK-objc-4: [[@LINE-2]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
30+
// CHECK-objc: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
3931

4032
let _: Int = strlcat
41-
// CHECK-objc-3: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> UInt'{{( [(]aka .+[)])?}} to specified type 'Int'
42-
// CHECK-objc-4: [[@LINE-2]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
33+
// CHECK-objc: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
4334

4435
// wcslen is different: it wasn't a builtin until Swift 4, and so its return
4536
// type has always been 'Int'.
4637
let _: Int = wcslen
47-
// CHECK-objc-3: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
48-
// CHECK-objc-4: [[@LINE-2]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
38+
// CHECK-objc: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
4939
}
5040
#endif

‎test/ClangImporter/objc_bridging_generics_swift3.swift

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎test/ClangImporter/objc_curried_method.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %target-swift-frontend -swift-version 3 -typecheck %s -enable-objc-interop -import-objc-header %S/Inputs/objc_curried_method.h
2-
// RUN: %target-swift-frontend -swift-version 4 -typecheck %s -enable-objc-interop -import-objc-header %S/Inputs/objc_curried_method.h
1+
// RUN: %target-swift-frontend -typecheck %s -enable-objc-interop -import-objc-header %S/Inputs/objc_curried_method.h
32

43
// rdar://problem/32588152
54

‎test/ClangImporter/subclass_existentials_swift3.swift

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎test/Compatibility/accessibility_compound.swift

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)