averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Fix and re-enable @_spi_available tests

Browse Source 
The main issue was that the tests specified `-library-level=api` in
`swift-frontend` invocations instead of `-library-level api`. The former seems
to have no effect and therefore expected diagnostics were not being emitted.

Additional clean up:
- Make every test require `OS=macosx` for ease of local testing.
- Avoid unnecessarily specifying target arches (this makes tests slow).
- Add missing `FileCheck` invocation.
- Add some missing test coverage.

Resolves rdar://91325474
This commit is contained in:
Allan Shortlidge
2023-03-28 09:07:33 -07:00
parent be620b8ada
commit f4b79594a8
5 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/ModuleInterface/spi-available.swift
View File

@@ -1,8 +1,10 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-frontend -parse-as-library %s -emit-module -library-level=api -emit-module-path %t/Foo.swiftmodule -module-name Foo -emit-module-interface-path %t/Foo.swiftinterface -emit-private-module-interface-path %t/Foo.private.swiftinterface
// RUN: %target-swift-emit-module-interfaces(%t/Foo.swiftinterface, %t/Foo.private.swiftinterface) -parse-as-library %s -library-level api
// RUN: %target-swift-frontend -compile-module-from-interface %t/Foo.swiftinterface -o %t/Foo.public.swiftmodule -module-name Foo
// RUN: %target-swift-frontend -compile-module-from-interface %t/Foo.private.swiftinterface -o %t/Foo.private.swiftmodule -module-name Foo
// RUN: %FileCheck %s --check-prefix=CHECK-PUBLIC < %t/Foo.swiftinterface
// RUN: %FileCheck %s --check-prefix=CHECK-PRIVATE < %t/Foo.private.swiftinterface
@_spi_available(macOS 10.10, tvOS 14.0, *)
@available(iOS 8.0, *)

22
test/Sema/spi-available-context.swift
View File

@@ -1,13 +1,23 @@
// REQUIRES: VENDOR=apple
// REQUIRES: OS=macosx
// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx11.9 -library-level api
// RUN: %target-typecheck-verify-swift -library-level api
@_spi_available(macOS 10.4, *)
@_spi_available(macOS 10.10, *)
@available(iOS 8.0, *)
public protocol Foo { }
public protocol MacOSSPIProto {} // expected-note {{type declared here}}
@_spi_available(macOS 10.4, *)
@_spi_available(iOS 8.0, *)
@available(macOS 10.10, *)
public protocol iOSSPIProto {}
@_spi_available(macOS 10.10, *)
@available(iOS 8.0, *)
public class Bar {
public var foo: Foo?
public var macos: MacOSSPIProto?
public var ios: iOSSPIProto?
}
@available(macOS 10.10, iOS 8.0, *)
public class Baz {
public var macos: MacOSSPIProto? // expected-error {{cannot use protocol 'MacOSSPIProto' here; it is SPI}}
public var ios: iOSSPIProto?
}

10
test/Sema/spi-available-inline.swift
View File

@@ -1,16 +1,16 @@
// REQUIRES: VENDOR=apple
// REQUIRES: OS=macosx
// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx11.9 -library-level api
// RUN: %target-typecheck-verify-swift -library-level api
@_spi_available(macOS 10.4, *)
@_spi_available(macOS 10.10, *)
@available(iOS 8.0, *)
public class MacOSSPIClass { public init() {} }
@_spi_available(iOS 8.0, *)
@available(macOS 10.4, *)
@available(macOS 10.10, *)
public class iOSSPIClass { public init() {} }
@inlinable public func foo() { // expected-warning{{public declarations should have an availability attribute with an introduction version}}
@available(macOS 10.10, iOS 8.0, *)
@inlinable public func foo() {
_ = MacOSSPIClass() // expected-error {{class 'MacOSSPIClass' cannot be used in an '@inlinable' function because it is SPI}}
_ = iOSSPIClass()
}

21
test/Sema/spi-available-local.swift
View File

@@ -1,15 +1,16 @@
// REQUIRES: OS=ios
// REQUIRES: rdar91325474
// RUN: %empty-directory(%t)
// RUN: not %target-swift-frontend -target x86_64-apple-macosx11.9 -parse-as-library %s -typecheck -library-level=api >& %t/macos.txt
// RUN: %FileCheck %s < %t/macos.txt
// RUN: %target-swift-frontend -target arm64-apple-ios13.0 -parse-as-library %s -typecheck -library-level=api
// REQUIRES: OS=macosx
// RUN: %target-typecheck-verify-swift -parse-as-library -library-level api
@_spi_available(macOS 10.10, *)
@available(iOS 8.0, *)
public class SPIClass {}
public class MacOSSPIClass {} // expected-note {{type declared here}}
public func foo(_ c: SPIClass) {}
@_spi_available(iOS 8.0, *)
@available(macOS 10.10, *)
public class iOSSPIClass {}
// CHECK: cannot use class 'SPIClass' here; it is SPI
@available(macOS 10.10, iOS 8.0, *)
public class MacOSDerived: MacOSSPIClass {} // expected-error {{cannot use class 'MacOSSPIClass' here; it is SPI}}
@available(macOS 10.10, iOS 8.0, *)
public class iOSDerived: iOSSPIClass {}

34
test/Sema/spi-available-swift-module.swift
View File

@@ -1,28 +1,26 @@
// REQUIRES: OS=ios
// REQUIRES: rdar91325474
// REQUIRES: OS=macosx
// RUN: %empty-directory(%t)
// RUN: %empty-directory(%t/macos)
// RUN: %empty-directory(%t/ios)
// RUN: split-file %s %t
// RUN: %target-swift-frontend -target x86_64-apple-macosx11.9 -parse-as-library %s -emit-module -library-level=api -emit-module-path %t/macos/Foo.swiftmodule -module-name Foo -DFoo
// RUN: %target-swift-frontend -target arm64-apple-ios13.0 -parse-as-library %s -emit-module -library-level=api -emit-module-path %t/ios/Foo.swiftmodule -module-name Foo -DFoo
// RUN: %target-swift-frontend -parse-as-library %t/Foo.swift -emit-module -library-level api -emit-module-path %t/Foo.swiftmodule -module-name Foo
// RUN: %target-swift-frontend-typecheck -parse-as-library %t/Client.swift -verify -library-level api -I %t
// RUN: not %target-swift-frontend -target x86_64-apple-macosx11.9 -parse-as-library %s -typecheck -library-level=api -I %t/macos >& %t/macos.txt
// RUN: %FileCheck %s < %t/macos.txt
// RUN: %target-swift-frontend -target arm64-apple-ios13.0 -parse-as-library %s -typecheck -library-level=api -I %t/ios
#if Foo
//--- Foo.swift
@_spi_available(macOS 10.10, *)
@available(iOS 8.0, *)
public class SPIClass {}
public class MacOSSPIClass {}
#else
@_spi_available(iOS 8.0, *)
@available(macOS 10.10, *)
public class iOSSPIClass {}
//--- Client.swift
import Foo
public func foo(_ c: SPIClass) {}
#endif
// CHECK: cannot use class 'SPIClass' here; it is an SPI imported from 'Foo'
@available(macOS 10.10, iOS 8.0, *)
public struct Foo {
public var macos: MacOSSPIClass // expected-error {{cannot use class 'MacOSSPIClass' here; it is an SPI imported from 'Foo'}}
public var ios: iOSSPIClass
}