Skip to content

Commit 8b098ab

Browse files
xymusxymus
committed
[Tests] Remove the flag AccessLevelOnImport from all tests but one
1 parent 7b1bc00 commit 8b098ab

18 files changed

+51
-107
lines changed

‎test/ModuleInterface/access-level-import-swiftinterfaces.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
// RUN: -package-name TestPackage \
2323
// RUN: -enable-library-evolution -swift-version 5 \
2424
// RUN: -emit-module-interface-path %t/Client.swiftinterface \
25-
// RUN: -emit-private-module-interface-path %t/Client.private.swiftinterface \
26-
// RUN: -enable-experimental-feature AccessLevelOnImport
25+
// RUN: -emit-private-module-interface-path %t/Client.private.swiftinterface
2726

2827
// RUN: %target-swift-typecheck-module-from-interface(%t/Client.swiftinterface) -I %t
2928
// RUN: %target-swift-typecheck-module-from-interface(%t/Client.private.swiftinterface) -I %t \
@@ -37,8 +36,7 @@
3736
// RUN: -package-name TestPackage \
3837
// RUN: -enable-library-evolution -swift-version 5 \
3938
// RUN: -emit-module-interface-path %t/MultiFiles.swiftinterface \
40-
// RUN: -emit-private-module-interface-path %t/MultiFiles.private.swiftinterface \
41-
// RUN: -enable-experimental-feature AccessLevelOnImport
39+
// RUN: -emit-private-module-interface-path %t/MultiFiles.private.swiftinterface
4240

4341
// RUN: %target-swift-typecheck-module-from-interface(%t/MultiFiles.swiftinterface) -I %t
4442
// RUN: %target-swift-typecheck-module-from-interface(%t/MultiFiles.private.swiftinterface) -I %t \

‎test/ScanDependencies/required_deps_of_testable_imports.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@testable import Foo
99

1010
// Step 1: build swift interface and swift module side by side, make them testable
11-
// RUN: %target-swift-frontend -emit-module %t/Foo.swift -emit-module-path %t/Foo.swiftmodule/%target-swiftmodule-name -module-name Foo -emit-module-interface-path %t/Foo.swiftmodule/%target-swiftinterface-name -I %S/Inputs/CHeaders -I %S/Inputs/Swift -enable-testing -enable-experimental-feature AccessLevelOnImport
11+
// RUN: %target-swift-frontend -emit-module %t/Foo.swift -emit-module-path %t/Foo.swiftmodule/%target-swiftmodule-name -module-name Foo -emit-module-interface-path %t/Foo.swiftmodule/%target-swiftinterface-name -I %S/Inputs/CHeaders -I %S/Inputs/Swift -enable-testing
1212

1313
// Step 2: scan dependencies
1414
// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -sdk %t -prebuilt-module-cache-path %t/clang-module-cache -I %S/Inputs/CHeaders -I %S/Inputs/Swift

‎test/Sema/access-level-import-conformances.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
// RUN: %target-swift-frontend -emit-module %t/ConformanceDefinition.swift -o %t -I %t
77

88
/// Check diagnostics.
9-
// RUN: %target-swift-frontend -typecheck -verify %t/Client.swift -I %t \
10-
// RUN: -enable-experimental-feature AccessLevelOnImport
9+
// RUN: %target-swift-frontend -typecheck -verify %t/Client.swift -I %t
1110

1211
//--- ConformanceBaseTypes.swift
1312
public protocol Proto {}

‎test/Sema/access-level-import-diag-priority.swift

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@
1414

1515
/// Check diagnostics.
1616
// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
17-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
18-
// RUN: -package-name pkg
17+
// RUN: -package-name pkg -verify
1918
// RUN: %target-swift-frontend -typecheck %t/PackageTypeImportedAsPackageClient.swift -I %t \
20-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
21-
// RUN: -package-name pkg
19+
// RUN: -package-name pkg -verify
2220
// RUN: %target-swift-frontend -typecheck %t/LocalVsImportClient.swift -I %t \
23-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
24-
// RUN: -package-name pkg
21+
// RUN: -package-name pkg -verify
2522

2623
//--- PublicLib.swift
2724
public struct PublicImportType {}

‎test/Sema/access-level-import-exportability.swift

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,17 @@
1515

1616
/// Check diagnostics.
1717
// RUN: %target-swift-frontend -typecheck %t/MinimalClient.swift -I %t \
18-
// RUN: -package-name TestPackage -swift-version 5 \
19-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify
18+
// RUN: -package-name TestPackage -swift-version 5 -verify
2019
// RUN: %target-swift-frontend -typecheck %t/CompletenessClient.swift -I %t \
21-
// RUN: -package-name TestPackage -swift-version 5 \
22-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify
20+
// RUN: -package-name TestPackage -swift-version 5 -verify
2321

2422
/// Check diagnostics with library-evolution.
2523
// RUN: %target-swift-frontend -typecheck %t/MinimalClient.swift -I %t \
2624
// RUN: -package-name TestPackage -swift-version 5 \
27-
// RUN: -enable-library-evolution \
28-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify
25+
// RUN: -enable-library-evolution -verify
2926
// RUN: %target-swift-frontend -typecheck %t/CompletenessClient.swift -I %t \
3027
// RUN: -package-name TestPackage -swift-version 5 \
31-
// RUN: -enable-library-evolution \
32-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify
28+
// RUN: -enable-library-evolution -verify
3329

3430
//--- PublicLib.swift
3531
public protocol PublicImportProto {

‎test/Sema/access-level-import-inconsistencies.swift

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
public struct LibType {}
2222

2323
// RUN: %target-swift-frontend -typecheck %t/OneFile_AllExplicit.swift -I %t \
24-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
25-
// RUN: -package-name package
24+
// RUN: -package-name package -verify
2625
//--- OneFile_AllExplicit.swift
2726
public import Lib // expected-warning {{public import of 'Lib' was not used in public declarations or inlinable code}}
2827
package import Lib // expected-warning {{package import of 'Lib' was not used in package declarations}}
@@ -31,8 +30,7 @@ fileprivate import Lib
3130
private import Lib
3231

3332
// RUN: %target-swift-frontend -typecheck %t/ManyFiles_AllExplicit_File?.swift -I %t \
34-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
35-
// RUN: -package-name package
33+
// RUN: -package-name package -verify
3634
//--- ManyFiles_AllExplicit_FileA.swift
3735
public import Lib // expected-warning {{public import of 'Lib' was not used in public declarations or inlinable code}}
3836
//--- ManyFiles_AllExplicit_FileB.swift
@@ -45,23 +43,21 @@ fileprivate import Lib
4543
private import Lib
4644

4745
// RUN: %target-swift-frontend -typecheck %t/ManyFiles_ImplicitVsInternal_FileB.swift -I %t \
48-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
49-
// RUN: -primary-file %t/ManyFiles_ImplicitVsInternal_FileA.swift
46+
// RUN: -primary-file %t/ManyFiles_ImplicitVsInternal_FileA.swift -verify
5047
//--- ManyFiles_ImplicitVsInternal_FileA.swift
5148
import Lib // expected-error {{ambiguous implicit access level for import of 'Lib'; it is imported as 'internal' elsewhere}}
5249
//--- ManyFiles_ImplicitVsInternal_FileB.swift
5350
internal import Lib // expected-note {{imported 'internal' here}}
5451

5552
// RUN: %target-swift-frontend -typecheck %t/ManyFiles_ImplicitVsPackage_FileB.swift -I %t \
56-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
57-
// RUN: -primary-file %t/ManyFiles_ImplicitVsPackage_FileA.swift
53+
// RUN: -primary-file %t/ManyFiles_ImplicitVsPackage_FileA.swift -verify
5854
//--- ManyFiles_ImplicitVsPackage_FileA.swift
5955
import Lib // expected-error {{ambiguous implicit access level for import of 'Lib'; it is imported as 'package' elsewhere}}
6056
//--- ManyFiles_ImplicitVsPackage_FileB.swift
6157
package import Lib // expected-note {{imported 'package' here}} @:1
6258

6359
// RUN: %target-swift-frontend -typecheck %t/ManyFiles_AmbiguitySwift6_File?.swift -I %t \
64-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify -swift-version 6
60+
// RUN: -verify -swift-version 6
6561
// RUN: %target-swift-frontend -typecheck %t/ManyFiles_AmbiguitySwift6_File?.swift -I %t \
6662
// RUN: -enable-upcoming-feature InternalImportsByDefault -verify
6763
//--- ManyFiles_AmbiguitySwift6_FileA.swift

‎test/Sema/access-level-import-inlinable.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818

1919
/// Check diagnostics.
2020
// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
21-
// RUN: -enable-library-evolution -swift-version 5 \
22-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
21+
// RUN: -enable-library-evolution -swift-version 5 -verify \
2322
// RUN: -package-name package
2423

2524
//--- PublicLib.swift

‎test/Sema/access-level-import-parsing.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111

1212
/// Check that all access levels are accepted, except for 'open'.
1313
// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
14-
// RUN: -enable-experimental-feature AccessLevelOnImport -verify \
15-
// RUN: -package-name package
14+
// RUN: -package-name package -verify
1615

1716
//--- PublicLib.swift
1817
//--- PackageLib.swift

‎test/Sema/access-level-import-typealias.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
// RUN: %target-swift-typecheck-module-from-interface(%t/Aliases.swiftinterface) -I %t
99

1010
// RUN: %target-swift-frontend -typecheck -verify %t/UsesAliasesNoImport.swift -I %t \
11-
// RUN: -swift-version 5 -enable-library-evolution \
12-
// RUN: -enable-experimental-feature AccessLevelOnImport
11+
// RUN: -swift-version 5 -enable-library-evolution
1312
// RUN: %target-swift-frontend -typecheck -verify %t/UsesAliasesNoImport.swift -I %t \
1413
// RUN: -swift-version 5 -enable-library-evolution \
1514
// RUN: -enable-upcoming-feature InternalImportsByDefault

‎test/Sema/conflicting-import-restrictions.swift

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,15 @@
3838

3939
/// Access levels on imports
4040
// RUN: %target-swift-frontend -typecheck %t/Public_Exported.swift -I %t -verify \
41-
// RUN: -experimental-spi-only-imports -verify \
42-
// RUN: -enable-experimental-feature AccessLevelOnImport
41+
// RUN: -experimental-spi-only-imports -verify
4342
// RUN: %target-swift-frontend -typecheck %t/Package_Exported.swift -I %t -verify \
44-
// RUN: -experimental-spi-only-imports -verify \
45-
// RUN: -enable-experimental-feature AccessLevelOnImport
43+
// RUN: -experimental-spi-only-imports -verify
4644
// RUN: %target-swift-frontend -typecheck %t/Internal_Exported.swift -I %t -verify \
47-
// RUN: -experimental-spi-only-imports -verify \
48-
// RUN: -enable-experimental-feature AccessLevelOnImport
45+
// RUN: -experimental-spi-only-imports -verify
4946
// RUN: %target-swift-frontend -typecheck %t/Fileprivate_Exported.swift -I %t -verify \
50-
// RUN: -experimental-spi-only-imports -verify \
51-
// RUN: -enable-experimental-feature AccessLevelOnImport
47+
// RUN: -experimental-spi-only-imports -verify
5248
// RUN: %target-swift-frontend -typecheck %t/Private_Exported.swift -I %t -verify \
53-
// RUN: -experimental-spi-only-imports -verify \
54-
// RUN: -enable-experimental-feature AccessLevelOnImport
49+
// RUN: -experimental-spi-only-imports -verify
5550

5651
//--- Public_Exported.swift
5752
@_exported public import Lib // expected-warning {{public import of 'Lib' was not used in public declarations or inlinable code}}

0 commit comments

Comments
 (0)