Skip to content

Commit 2bccdad

Browse files
swift-ciswift-ci
authored
Merge pull request #20943 from compnerd/separation-anxiety
2 parents 858dc5b + 364a473 commit 2bccdad

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

‎test/ClangImporter/MixedSource/broken-modules.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: not %target-swift-frontend -enable-objc-interop -typecheck %s -I %S/Inputs/broken-modules/ -enable-source-import -show-diagnostics-after-fatal -o /dev/null 2>&1 | %FileCheck -check-prefix CHECK -check-prefix CLANG-CHECK %s
2+
// RUN: not %target-swift-frontend -enable-objc-interop -typecheck %/s -I %S/Inputs/broken-modules/ -enable-source-import -show-diagnostics-after-fatal -o /dev/null 2>&1 | %FileCheck -check-prefix CHECK -check-prefix CLANG-CHECK %s
33

4-
// RUN: not %target-swift-frontend -typecheck %s -enable-objc-interop -import-objc-header %S/Inputs/broken-modules/BrokenClangModule.h -enable-source-import -o /dev/null 2>&1 | %FileCheck -check-prefix CHECK-BRIDGING-HEADER -check-prefix CLANG-CHECK %s
4+
// RUN: not %target-swift-frontend -typecheck %/s -enable-objc-interop -import-objc-header %S/Inputs/broken-modules/BrokenClangModule.h -enable-source-import -o /dev/null 2>&1 | %FileCheck -check-prefix CHECK-BRIDGING-HEADER -check-prefix CLANG-CHECK %s
55

66
// RUN: not %target-swift-frontend -typecheck %s -enable-objc-interop -import-objc-header %S/../../Inputs/empty.swift 2>&1 | %FileCheck -check-prefix=EMPTY-HEADER %s
77

‎test/ClangImporter/non-modular-include.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: not %target-swift-frontend -enable-objc-interop -typecheck %s -I %S/Inputs/non-modular -F %S/Inputs/non-modular 2>&1 | %FileCheck --check-prefix=CHECK -check-prefix CHECK-objc %s
3-
// RUN: not %target-swift-frontend -disable-objc-interop -typecheck %s -I %S/Inputs/non-modular -F %S/Inputs/non-modular 2>&1 | %FileCheck --check-prefix=CHECK -check-prefix CHECK-native %s
2+
// RUN: not %target-swift-frontend -enable-objc-interop -typecheck %/s -I %S/Inputs/non-modular -F %S/Inputs/non-modular 2>&1 | %FileCheck --check-prefix=CHECK -check-prefix CHECK-objc %s
3+
// RUN: not %target-swift-frontend -disable-objc-interop -typecheck %/s -I %S/Inputs/non-modular -F %S/Inputs/non-modular 2>&1 | %FileCheck --check-prefix=CHECK -check-prefix CHECK-native %s
44

55
// CHECK: {{.+}}/non-modular/Foo.framework/Headers/Foo.h:1:9: error: include of non-modular header inside framework module 'Foo'
66
// CHECK-objc: error: could not build Objective-C module 'Foo'

‎test/Frontend/parse-sil-inputs.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: not %target-swift-frontend -parse-sil -emit-sil 2>&1 | %FileCheck -check-prefix=SIL_FILES %s
22
// SIL_FILES: this mode requires a single input file
33

4-
// RUN: not %target-swift-frontend -parse-sil -emit-sil %s %s 2>&1 | %FileCheck -check-prefix=DUPLICATE_FILES %s
5-
// RUN: not %target-swift-frontend -parse-sil -emit-sil %s %S/../Inputs/empty.swift 2>&1 | %FileCheck -check-prefix=SIL_FILES %s
4+
// RUN: not %target-swift-frontend -parse-sil -emit-sil %/s %/s 2>&1 | %FileCheck -check-prefix=DUPLICATE_FILES %s
5+
// RUN: not %target-swift-frontend -parse-sil -emit-sil %/s %/S/../Inputs/empty.swift 2>&1 | %FileCheck -check-prefix=SIL_FILES %s
66
// DUPLICATE_FILES: duplicate input file 'SOURCE_DIR/test/Frontend/parse-sil-inputs.swift'

‎test/Index/Store/unit-from-compile.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
// CHECK: is-module: 0
1111
// CHECK: module-name: some_module_test
1212
// CHECK: has-main: 1
13-
// CHECK: main-path: {{.*}}/unit-from-compile.swift
14-
// CHECK: out-file: {{.*}}/file1.o
13+
// CHECK: main-path: {{.*}}{{/|\\}}unit-from-compile.swift
14+
// CHECK: out-file: {{.*}}{{/|\\}}file1.o
1515
// CHECK: is-debug: 1
1616

1717
// CHECK: DEPEND START
18-
// CHECK: Unit | system | {{.*}}/Swift.swiftmodule
18+
// CHECK: Unit | system | {{.*}}{{/|\\}}Swift.swiftmodule
1919
// CHECK: DEPEND END (1)
2020

2121
// OPT: is-debug: 1

‎test/Index/Store/unit-one-file-multi-file-invocation.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
// UNIT: unit-one-file-multi-file-invocation{{.*}}.output_for_index
1414
// UNIT: DEPEND START
15-
// UNIT: Unit | system |{{.*}}/Swift.swiftmodule | [[SWIFT]]
16-
// UNIT: Record | user |{{.*}}/unit-one-file-multi-file-invocation.swift |
15+
// UNIT: Unit | system | {{.*}}{{/|\\}}Swift.swiftmodule | [[SWIFT]]
16+
// UNIT: Record | user | {{.*}}{{/|\\}}unit-one-file-multi-file-invocation.swift |
1717
// UNIT: DEPEND END (2)
1818

1919
func test1() {

‎test/Index/Store/unit-swiftmodule-dependency.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,37 @@ func test() {
1919
// CHECK: [[MODA:SwiftModuleA.swiftmodule-[A-Z0-9]*]]
2020
// CHECK: --------
2121
// CHECK: has-main: 1
22-
// CHECK: out-file: {{.*}}/SwiftModuleA.swiftmodule
22+
// CHECK: out-file: {{.*}}{{/|\\}}SwiftModuleA.swiftmodule
2323
// CHECK: DEPEND START
24-
// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule
24+
// CHECK: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule
2525
// CHECK: DEPEND END
2626

2727
// CHECK: [[MODB:SwiftModuleB.swiftmodule-[A-Z0-9]*]]
2828
// CHECK: --------
2929
// CHECK: has-main: 1
3030
// CHECK: out-file: {{.*}}/SwiftModuleB.swiftmodule
3131
// CHECK: DEPEND START
32-
// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule
33-
// CHECK: Unit | user | SwiftModuleA | {{.*}}/SwiftModuleA.swiftmodule
32+
// CHECK: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule
33+
// CHECK: Unit | user | SwiftModuleA | {{.*}}{{/|\\}}SwiftModuleA.swiftmodule
3434
// CHECK: DEPEND END
3535

3636
// CHECK-NOT: main.swiftmodule-
3737

3838
// CHECK: s1.o-
3939
// CHECK: --------
4040
// CHECK: has-main: 1
41-
// CHECK: out-file: {{.*}}/s1.o
41+
// CHECK: out-file: {{.*}}{{/|\\}}s1.o
4242
// CHECK: DEPEND START
43-
// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule
44-
// CHECK: Unit | user | SwiftModuleA | {{.*}}/SwiftModuleA.swiftmodule
45-
// CHECK: Unit | user | SwiftModuleB | {{.*}}/SwiftModuleB.swiftmodule
43+
// CHECK: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule
44+
// CHECK: Unit | user | SwiftModuleA | {{.*}}{{/|\\}}SwiftModuleA.swiftmodule
45+
// CHECK: Unit | user | SwiftModuleB | {{.*}}{{/|\\}}SwiftModuleB.swiftmodule
4646
// CHECK: DEPEND END
4747

4848
// CHECK: s2.o-
4949
// CHECK: --------
5050
// CHECK: has-main: 1
51-
// CHECK: out-file: {{.*}}/s2.o
51+
// CHECK: out-file: {{.*}}{{/|\\}}s2.o
5252
// CHECK: DEPEND START
53-
// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule
54-
// CHECK: Unit | user | SwiftModuleA | {{.*}}/SwiftModuleA.swiftmodule
53+
// CHECK: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule
54+
// CHECK: Unit | user | SwiftModuleA | {{.*}}{{/|\\}}SwiftModuleA.swiftmodule
5555
// CHECK: DEPEND END

0 commit comments

Comments
 (0)