Skip to content

Commit f99a793

Browse files
committed
Tests: Consolidate inputs for MemberImportVisibility tests.
NFC.
1 parent d015d16 commit f99a793

17 files changed

+22
-13
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@import Categories_A;
2+
3+
@interface X (BridgingHeader)
4+
- (void)fromBridgingHeader;
5+
@end
6+
7+
struct StructInBridgingHeader {
8+
int member;
9+
};

test/NameLookup/members_transitive.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/members_A.swift
3-
// RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/members_B.swift
4-
// RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/members_C.swift
5-
// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/members_transitive_other.swift -I %t -verify -swift-version 5
6-
// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/members_transitive_other.swift -I %t -verify -swift-version 6
7-
// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/members_transitive_other.swift -I %t -verify -swift-version 5 -enable-experimental-feature MemberImportVisibility -verify-additional-prefix member-visibility-
2+
// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/MemberImportVisibility/members_A.swift
3+
// RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/MemberImportVisibility/members_B.swift
4+
// RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/MemberImportVisibility/members_C.swift
5+
// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/MemberImportVisibility/members_transitive_other.swift -I %t -verify -swift-version 5
6+
// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/MemberImportVisibility/members_transitive_other.swift -I %t -verify -swift-version 6
7+
// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/MemberImportVisibility/members_transitive_other.swift -I %t -verify -swift-version 5 -enable-experimental-feature MemberImportVisibility -verify-additional-prefix member-visibility-
88

99
import members_C
1010
// expected-member-visibility-note 7{{add import of module 'members_B'}}{{1-1=import members_B\n}}

test/NameLookup/members_transitive_objc.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_A.swift
3-
// RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_B.swift
4-
// RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_C.swift
5-
// RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_E.swift
6-
// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/Categories -import-objc-header %S/Inputs/Categories/Bridging.h -verify -swift-version 5
7-
// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/Categories -import-objc-header %S/Inputs/Categories/Bridging.h -verify -swift-version 6
8-
// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/Categories -import-objc-header %S/Inputs/Categories/Bridging.h -verify -swift-version 5 -enable-experimental-feature MemberImportVisibility -verify-additional-prefix member-visibility-
2+
// RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/MemberImportVisibility -o %t %S/Inputs/MemberImportVisibility/Categories_A.swift
3+
// RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/MemberImportVisibility -o %t %S/Inputs/MemberImportVisibility/Categories_B.swift
4+
// RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/MemberImportVisibility -o %t %S/Inputs/MemberImportVisibility/Categories_C.swift
5+
// RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/MemberImportVisibility -o %t %S/Inputs/MemberImportVisibility/Categories_E.swift
6+
// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/MemberImportVisibility -import-objc-header %S/Inputs/MemberImportVisibility/Bridging.h -verify -swift-version 5
7+
// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/MemberImportVisibility -import-objc-header %S/Inputs/MemberImportVisibility/Bridging.h -verify -swift-version 6
8+
// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/MemberImportVisibility -import-objc-header %S/Inputs/MemberImportVisibility/Bridging.h -verify -swift-version 5 -enable-experimental-feature MemberImportVisibility -verify-additional-prefix member-visibility-
99

1010
// REQUIRES: objc_interop
1111

0 commit comments

Comments
 (0)