ModuleInterface: Adopt swiftinterface verification lit substitutions in skip-override-keyword.swift and skip-override-spi.swift. Add CHECK lines to these tests to make their expectations a bit more explicit.

Author: tshortli

test/ModuleInterface/skip-override-keyword.swift

@@ -1,24 +1,39 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -typecheck -module-name Foo -emit-module-interface-path %t/Foo.swiftinterface %s
-// RUN: %target-swift-frontend -compile-module-from-interface %t/Foo.swiftinterface -o %t/Foo.swiftmodule
+// RUN: %target-swift-emit-module-interface(%t/Foo.swiftinterface) %s -module-name Foo
+// RUN: %target-swift-typecheck-module-from-interface(%t/Foo.swiftinterface) -module-name Foo
+// RUN: %FileCheck %s < %t/Foo.swiftinterface
 
-// RUN: %target-swift-frontend -typecheck -enable-testing -module-name FooWithTesting -emit-module-interface-path %t/FooWithTesting.swiftinterface %s
-// RUN: %target-swift-frontend -compile-module-from-interface %t/FooWithTesting.swiftinterface -o %t/FooWithTesting.swiftmodule
+// RUN: %target-swift-emit-module-interface(%t/FooWithTesting.swiftinterface) %s -module-name FooWithTesting -enable-testing
+// RUN: %target-swift-typecheck-module-from-interface(%t/FooWithTesting.swiftinterface) -module-name FooWithTesting
+// RUN: %FileCheck %s < %t/FooWithTesting.swiftinterface
 
+// CHECK: @_hasMissingDesignatedInitializers public class BaseClass
 public class BaseClass {
   init() { }
   var property: Int { return 1 }
   func doSomething() { }
   subscript(index: Int) -> Int { get { return 0 } set(newValue) {} }
+  // CHECK: @usableFromInline
+  // CHECK-NEXT: internal func doSomethingInline()
   @usableFromInline func doSomethingInline() {}
+  // CHECK: @usableFromInline
+  // CHECK-NEXT: internal func doSomethingUsableFromInline()
   @usableFromInline func doSomethingUsableFromInline() {}
 }
 
+// CHECK: @_inheritsConvenienceInitializers public class DerivedClass : {{Foo|FooWithTesting}}.BaseClass
 public class DerivedClass: BaseClass {
+  // CHECK: public init()
   public override init() { super.init() }
+  // CHECK: public var property: Swift.Int
   public override var property : Int { return 0 }
+  // CHECK: public func doSomething()
   public override func doSomething() { }
+  // CHECK: public subscript(index: Swift.Int) -> Swift.Int
   public override subscript(index: Int) -> Int { get {return 0} set(newValue) {} }
+  // CHECK: @inlinable override public func doSomethingInline() { super.doSomethingInline() }
   @inlinable public override func doSomethingInline() { super.doSomethingInline() }
+  // CHECK: @usableFromInline
+  // CHECK-NEXT: override internal func doSomethingUsableFromInline()
   @usableFromInline override func doSomethingUsableFromInline() { super.doSomethingUsableFromInline() }
 }

test/ModuleInterface/skip-override-spi.swift

@@ -1,11 +1,15 @@
 // RUN: %empty-directory(%t)
-// RUN: %empty-directory(%t/inputs)
-// RUN: %empty-directory(%t/modulecache)
-// RUN: echo "public class HideyHole { @_spi(Private) public init() {} }" > %t/Foo.swift
-// RUN: echo "public class StashyCache: HideyHole {}" >> %t/Foo.swift
+// RUN: %target-swift-emit-module-interface(%t/Foo.swiftinterface) %s -module-name Foo
+// RUN: %target-swift-typecheck-module-from-interface(%t/Foo.swiftinterface) -module-name Foo
+// RUN: %FileCheck %s < %t/Foo.swiftinterface
 
-// RUN: %target-swift-frontend -emit-module -emit-module-interface-path %t/inputs/Foo.swiftinterface %t/Foo.swift -module-name Foo
+// CHECK: public class HideyHole
+public class HideyHole {
+  // CHECK-NOT: public init()
+  @_spi(Private) public init() {}
+}
 
-// RUN: %target-swift-frontend -emit-module-path %t/Bar.swiftmodule -enable-library-evolution -enable-objc-interop -disable-objc-attr-requires-foundation-module -module-name Bar %s -I %t/inputs -disable-availability-checking -module-cache-path %t/modulecache
-
-import Foo
+// CHECK: @_inheritsConvenienceInitializers public class StashyCache : Foo.HideyHole
+public class StashyCache: HideyHole {
+  // CHECK: public init()
+}