From 750b141f31310114f47c97762238b7bc1d54f7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Laferri=C3=A8re?= Date: Wed, 4 Sep 2024 16:40:42 -0700 Subject: [PATCH] Tests: enable library-evolution in tests using @_implementationOnly imports --- test/ClangImporter/objc_init_redundant.swift | 4 ++-- test/ModuleInterface/imports.swift | 2 +- .../decl/ext/objc_implementation_class_extension.swift | 2 +- test/decl/ext/objc_implementation_impl_only.swift | 2 +- .../decl/import/inconsistent-implementation-only.swift | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/ClangImporter/objc_init_redundant.swift b/test/ClangImporter/objc_init_redundant.swift index 52c29ad2d84..eb49c23e5c3 100644 --- a/test/ClangImporter/objc_init_redundant.swift +++ b/test/ClangImporter/objc_init_redundant.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %S/Inputs/custom-modules -F %S/Inputs/frameworks) -import-underlying-module -import-objc-header %S/Inputs/objc_init_redundant_bridging.h -emit-sil %s -verify -// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %S/Inputs/custom-modules -F %S/Inputs/frameworks) -import-underlying-module -import-objc-header %S/Inputs/objc_init_redundant_bridging.h -emit-sil %s > %t.log 2>&1 +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %S/Inputs/custom-modules -F %S/Inputs/frameworks) -import-underlying-module -import-objc-header %S/Inputs/objc_init_redundant_bridging.h -emit-sil %s -verify -swift-version 5 -enable-library-evolution +// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %S/Inputs/custom-modules -F %S/Inputs/frameworks) -import-underlying-module -import-objc-header %S/Inputs/objc_init_redundant_bridging.h -emit-sil %s -swift-version 5 -enable-library-evolution > %t.log 2>&1 // RUN: %FileCheck %s < %t.log // REQUIRES: objc_interop diff --git a/test/ModuleInterface/imports.swift b/test/ModuleInterface/imports.swift index e9dadaebed7..7918bb18685 100644 --- a/test/ModuleInterface/imports.swift +++ b/test/ModuleInterface/imports.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -emit-module -o %t/empty.swiftmodule %S/../Inputs/empty.swift // RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -emit-module -o %t/emptyButWithLibraryEvolution.swiftmodule %S/../Inputs/empty.swift -enable-library-evolution -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s %S/Inputs/imports-other.swift -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -I %S/Inputs/imports-clang-modules/ -I %t -verify +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s %S/Inputs/imports-other.swift -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -I %S/Inputs/imports-clang-modules/ -I %t -verify -swift-version 5 -enable-library-evolution // RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -I %S/Inputs/imports-clang-modules/ -I %t // RUN: %FileCheck -implicit-check-not BAD %s < %t.swiftinterface diff --git a/test/decl/ext/objc_implementation_class_extension.swift b/test/decl/ext/objc_implementation_class_extension.swift index b4a2c6cfdab..123e459d824 100644 --- a/test/decl/ext/objc_implementation_class_extension.swift +++ b/test/decl/ext/objc_implementation_class_extension.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -import-underlying-module -Xcc -fmodule-map-file=%S/Inputs/objc_implementation_class_extension.modulemap -target %target-stable-abi-triple +// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -import-underlying-module -Xcc -fmodule-map-file=%S/Inputs/objc_implementation_class_extension.modulemap -target %target-stable-abi-triple -swift-version 5 -enable-library-evolution // REQUIRES: objc_interop @_implementationOnly import objc_implementation_class_extension_internal diff --git a/test/decl/ext/objc_implementation_impl_only.swift b/test/decl/ext/objc_implementation_impl_only.swift index c28c2d758f8..92fc8be78dc 100644 --- a/test/decl/ext/objc_implementation_impl_only.swift +++ b/test/decl/ext/objc_implementation_impl_only.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -Xcc -fmodule-map-file=%S/Inputs/objc_implementation_private.modulemap -target %target-stable-abi-triple +// RUN: %target-typecheck-verify-swift -Xcc -fmodule-map-file=%S/Inputs/objc_implementation_private.modulemap -target %target-stable-abi-triple -swift-version 5 -enable-library-evolution // REQUIRES: objc_interop @_implementationOnly import objc_implementation_internal diff --git a/test/decl/import/inconsistent-implementation-only.swift b/test/decl/import/inconsistent-implementation-only.swift index b8674988967..14ad6c2194d 100644 --- a/test/decl/import/inconsistent-implementation-only.swift +++ b/test/decl/import/inconsistent-implementation-only.swift @@ -2,11 +2,11 @@ // RUN: split-file %s %t // Check that the diagnostics are produced regardless of what primary file we're using. -// RUN: %target-swift-frontend -typecheck -primary-file %t/1.swift %t/2.swift %t/3.swift -I %S/Inputs/inconsistent-implementation-only/ -verify -// RUN: %target-swift-frontend -typecheck %t/1.swift -primary-file %t/2.swift %t/3.swift -I %S/Inputs/inconsistent-implementation-only/ -verify -// RUN: %target-swift-frontend -typecheck %t/1.swift %t/2.swift -primary-file %t/3.swift -I %S/Inputs/inconsistent-implementation-only/ -verify -// RUN: %target-swift-frontend -typecheck -primary-file %t/1.swift -primary-file %t/2.swift -primary-file %t/3.swift -I %S/Inputs/inconsistent-implementation-only/ -verify -// RUN: %target-swift-frontend -typecheck %t/1.swift %t/2.swift %t/3.swift -I %S/Inputs/inconsistent-implementation-only/ -verify +// RUN: %target-swift-frontend -typecheck -primary-file %t/1.swift %t/2.swift %t/3.swift -I %S/Inputs/inconsistent-implementation-only/ -verify -swift-version 5 -enable-library-evolution +// RUN: %target-swift-frontend -typecheck %t/1.swift -primary-file %t/2.swift %t/3.swift -I %S/Inputs/inconsistent-implementation-only/ -verify -swift-version 5 -enable-library-evolution +// RUN: %target-swift-frontend -typecheck %t/1.swift %t/2.swift -primary-file %t/3.swift -I %S/Inputs/inconsistent-implementation-only/ -verify -swift-version 5 -enable-library-evolution +// RUN: %target-swift-frontend -typecheck -primary-file %t/1.swift -primary-file %t/2.swift -primary-file %t/3.swift -I %S/Inputs/inconsistent-implementation-only/ -verify -swift-version 5 -enable-library-evolution +// RUN: %target-swift-frontend -typecheck %t/1.swift %t/2.swift %t/3.swift -I %S/Inputs/inconsistent-implementation-only/ -verify -swift-version 5 -enable-library-evolution //--- 1.swift