Merge pull request #31965 from DougGregor/generalize-attr-tests

Author: swift-ci

test/attr/ApplicationMain/attr_main_throws_prints_error.swift

@@ -1,9 +1,11 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift -parse-as-library %s -o %t/main
 // RUN: %target-codesign %t/main
-// RUN: not --crash %t/main 2>&1 | %FileCheck %s
+// RUN: %target-run %t/main > %t/log 2>&1 || true
+// RUN: %FileCheck %s < %t/log
+
 // REQUIRES: executable_test
-// REQUIRES: OS=macosx
+// REQUIRES: OS=macosx || OS=ios
 
 enum Err : Error { case or }
 

test/attr/Inputs/SymbolMove/LowLevel.swift

@@ -1,52 +1,52 @@
-@available(OSX 10.7, *)
-@_originallyDefinedIn(module: "HighLevel", OSX 10.9)
+@available(OSX 10.7, iOS 7.0, *)
+@_originallyDefinedIn(module: "HighLevel", OSX 10.9, iOS 13.0)
 public func printMessageMoved() {
   print("Hello from LowLevel")
 }
 
-@available(OSX 10.7, *)
-@_originallyDefinedIn(module: "HighLevel", OSX 10.9)
+@available(OSX 10.7, iOS 7.0, *)
+@_originallyDefinedIn(module: "HighLevel", OSX 10.9, iOS 13.0)
 public struct Entity {
     public let value = "LowLevel"
     public init() {}
     public func location() -> String { return "Entity from " + value }
 }
 
 // =================== Move protocol =================================//
-@available(OSX 10.7, *)
-@_originallyDefinedIn(module: "HighLevel", OSX 10.9)
+@available(OSX 10.7, iOS 7.0, *)
+@_originallyDefinedIn(module: "HighLevel", OSX 10.9, iOS 13.0)
 public protocol Box {
   associatedtype Item
   var ItemKind: String { get }
   func getItem() -> Item
   func shape() -> String
 }
 
-@available(OSX 10.7, *)
-@_originallyDefinedIn(module: "HighLevel", OSX 10.9)
+@available(OSX 10.7, iOS 7.0, *)
+@_originallyDefinedIn(module: "HighLevel", OSX 10.9, iOS 13.0)
 extension Box {
   public func shape() -> String { return "round"}
 }
 
-@available(OSX 10.7, *)
-@_originallyDefinedIn(module: "HighLevel", OSX 10.9)
+@available(OSX 10.7, iOS 7.0, *)
+@_originallyDefinedIn(module: "HighLevel", OSX 10.9, iOS 13.0)
 public struct Candy {
   public var kind = "candy"
   public init() {}
 }
 
 // =================== Move enum ============================ //
-@available(OSX 10.7, *)
-@_originallyDefinedIn(module: "HighLevel", OSX 10.9)
+@available(OSX 10.7, iOS 7.0, *)
+@_originallyDefinedIn(module: "HighLevel", OSX 10.9, iOS 13.0)
 public enum LanguageKind: Int {
   case Cpp = 1
   case Swift = 2
   case ObjC = 3
 }
 
 // =================== Move class ============================ //
-@available(OSX 10.7, *)
-@_originallyDefinedIn(module: "HighLevel", OSX 10.9)
+@available(OSX 10.7, iOS 7.0, *)
+@_originallyDefinedIn(module: "HighLevel", OSX 10.9, iOS 13.0)
 open class Vehicle {
     public init() {}
     public var currentSpeed = 40.0

test/attr/attr_originally_definedin_backward_compatibility.swift

@@ -1,5 +1,5 @@
-// REQUIRES: OS=macosx
 // REQUIRES: executable_test
+// REQUIRES: OS=macosx || OS=ios
 //
 // RUN: %empty-directory(%t)
 //
@@ -16,10 +16,10 @@
 
 // --- Build an executable using the original high level framework
 // RUN: %target-build-swift -emit-executable %s -g -o %t/HighlevelRunner -F %t/SDK/Frameworks/ -framework HighLevel \
-// RUN: 	-Xlinker -rpath -Xlinker %t/SDK/Frameworks
+// RUN: 	%target-rpath(@executable_path/SDK/Frameworks)
 
 // --- Run the executable
-// RUN: %t/HighlevelRunner | %FileCheck %s -check-prefix=BEFORE_MOVE
+// RUN: %target-run %t/HighlevelRunner %t/SDK/Frameworks/HighLevel.framework/HighLevel | %FileCheck %s -check-prefix=BEFORE_MOVE
 
 // --- Build low level framework.
 // RUN: mkdir -p %t/SDK/Frameworks/LowLevel.framework/Modules/LowLevel.swiftmodule
@@ -34,7 +34,7 @@
 // RUN:     %S/Inputs/SymbolMove/HighLevel.swift -F %t/SDK/Frameworks -Xlinker -reexport_framework -Xlinker LowLevel -enable-library-evolution
 
 // --- Run the executable
-// RUN: %t/HighlevelRunner | %FileCheck %s -check-prefix=AFTER_MOVE
+// RUN: %target-run %t/HighlevelRunner %t/SDK/Frameworks/HighLevel.framework/HighLevel %t/SDK/Frameworks/LowLevel.framework/LowLevel | %FileCheck %s -check-prefix=AFTER_MOVE
 
 import HighLevel