Skip to content

[Parse] Migrate tests to Swift4 #17796

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.

Sign up for GitHub

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 1 commit into from
Jul 7, 2018
Merged

[Parse] Migrate tests to Swift4 #17796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions test/Interpreter/bool_as_generic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// RUN: %target-run-simple-swift-swift3 | %FileCheck %s
// RUN: %target-run-simple-swift | %FileCheck %s
// REQUIRES: executable_test
// <rdar://problem/13986638> Missing Bool metadata when Bool is used as a generic
// parameter or existential value

prefix operator !! {}
infix operator &&& {}
prefix operator !!
infix operator &&&

protocol BooleanProtocol {
var boolValue: Bool { get }
Expand Down
8 changes: 4 additions & 4 deletions test/Interpreter/tuples.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// RUN: %target-run-simple-swift-swift3 | %FileCheck %s
// RUN: %target-run-simple-swift | %FileCheck %s
// REQUIRES: executable_test

typealias Interval = (lo: Int, hi: Int)

infix operator <+> {}
infix operator <-> {}
infix operator <+>= {}
infix operator <+>
infix operator <->
infix operator <+>=

func <+>(a: Interval, b: Interval) -> Interval {
return (a.lo + b.lo, a.hi + b.hi)
Expand Down
12 changes: 6 additions & 6 deletions test/Parse/ConditionalCompilation/identifierName.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-typecheck-verify-swift -swift-version 3
// RUN: %target-typecheck-verify-swift

// Ensure that the identifiers in compilation conditions don't reference
// any decls in the scope.
Expand All @@ -23,10 +23,10 @@ func f2(
_ = _endian + big + little
#elseif _runtime(_ObjC) && _runtime(_Native)
_ = _runtime + _ObjC + _Native
#elseif swift(>=1.0) && _compiler_version("3.*.0")
_ = swift + _compiler_version
#elseif targetEnvironment(simulator)
_ = targetEnvironment + simulator
#elseif swift(>=1.0) && _compiler_version("4.*.0")
_ = swift + _compiler_version
#endif

}
Expand All @@ -51,10 +51,10 @@ func f2() {
_ = _endian + big + little
#elseif _runtime(_ObjC) && _runtime(_Native)
_ = _runtime + _ObjC + _Native
#elseif swift(>=1.0) && _compiler_version("3.*.0")
_ = swift + _compiler_version
#elseif targetEnvironment(simulator)
_ = targetEnvironment + simulator
#elseif swift(>=1.0) && _compiler_version("4.*.0")
_ = swift + _compiler_version
#endif

}
Expand All @@ -74,8 +74,8 @@ struct S {
#elseif arch(i386) && arch(arm)
#elseif _endian(big) && _endian(little)
#elseif _runtime(_ObjC) && _runtime(_Native)
#elseif swift(>=1.0) && _compiler_version("3.*.0")
#elseif targetEnvironment(simulator)
#elseif swift(>=1.0) && _compiler_version("4.*.0")
#endif

}
Expand Down
26 changes: 0 additions & 26 deletions test/Parse/swift3_warnings_swift4_errors_version_3.swift
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions test/Prototypes/GenericDispatch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// prototype to which we can refer when building the standard library.
//
//===----------------------------------------------------------------------===//
// RUN: %target-run-simple-swift-swift3 | %FileCheck %s
// RUN: %target-run-simple-swift | %FileCheck %s
// REQUIRES: executable_test

// CHECK: testing...
Expand All @@ -34,7 +34,7 @@ protocol F {
// refinement of F having a non-default distance implementation need
// to know about it. These refinements are expected to be rare
// (which is why defaulted requirements are a win)
func ~> (_: Self, _: (_Distance, (Self))) -> Int
static func ~> (_: Self, _: (_Distance, (Self))) -> Int
}

// Operation tag for distance
Expand Down