Merge pull request #24964 from slavapestov/more-test-stable-abi-tweaks

Split up a couple more tests into stable and pre-stable ABI deployment target versions

Author: slavapestov

test/PrintAsObjC/resilient-ancestry-stable-abi.swift

@@ -0,0 +1,12 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module-path %t/resilient_struct.swiftmodule %S/../Inputs/resilient_struct.swift -enable-library-evolution
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module-path %t/resilient_objc_class.swiftmodule %S/../Inputs/resilient_objc_class.swift -I %t -enable-library-evolution -emit-objc-header-path %t/resilient_objc_class.h
+
+// RUN: cp %S/Inputs/custom-modules/module.map %t/module.map
+
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %S/resilient-ancestry.swift -module-name resilient -emit-objc-header-path %t/resilient.h -I %t -enable-library-evolution -enable-resilient-objc-class-stubs
+// RUN: %FileCheck %S/resilient-ancestry.swift < %t/resilient.h
+// RUN: %check-in-clang %t/resilient.h -I %t
+
+// REQUIRES: objc_interop
+// REQUIRES: swift_stable_abi

test/PrintAsObjC/resilient-ancestry.swift

@@ -10,12 +10,10 @@
 // RUN: %FileCheck %s --check-prefix=NO-STUBS < %t/resilient.h
 // RUN: %check-in-clang %t/resilient.h -I %t
 
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -module-name resilient -emit-objc-header-path %t/resilient.h -I %t -enable-library-evolution -enable-resilient-objc-class-stubs
-// RUN: %FileCheck %s < %t/resilient.h
-// RUN: %check-in-clang %t/resilient.h -I %t
-
 // REQUIRES: objc_interop
 
+// See also resilient-ancestry.swift, for the stable ABI deployment target test.
+
 import Foundation
 import resilient_objc_class
 

test/decl/protocol/conforms/nscoding.swift

@@ -2,16 +2,16 @@
 
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify
 // RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -disable-nskeyedarchiver-diagnostics 2>&1 | %FileCheck -check-prefix CHECK-NO-DIAGS %s
-
 // RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -dump-ast -target %target-pre-stable-abi-triple > %t/old.ast
-// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -dump-ast -target %target-stable-abi-triple > %t/new.ast
 
 // RUN: %FileCheck --check-prefix=CHECK-OLD %s < %t/old.ast
 // RUN: %FileCheck --check-prefix=NEGATIVE %s < %t/old.ast
-// RUN: %FileCheck --check-prefix=NEGATIVE --check-prefix=NEGATIVE-NEW %s < %t/new.ast
 
 // REQUIRES: objc_interop
 
+// See also nscoding_stable_abi.swift, for the stable ABI deployment
+// target test.
+
 // CHECK-NO-DIAGS-NOT: NSCoding
 // CHECK-NO-DIAGS-NOT: unstable
 

test/decl/protocol/conforms/nscoding_stable_abi.swift

@@ -0,0 +1,8 @@
+// RUN: %empty-directory(%t)
+
+// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %S/nscoding.swift -dump-ast -target %target-stable-abi-triple > %t/new.ast
+
+// RUN: %FileCheck --check-prefix=NEGATIVE --check-prefix=NEGATIVE-NEW %S/nscoding.swift < %t/new.ast
+
+// REQUIRES: objc_interop
+// REQUIRES: swift_stable_abi