Skip to content

Commit d8b0845

Browse files
compnerdcompnerd
authored
Merge pull request #22154 from compnerd/frontend-tests
test: adjust Frontend tests for Windows
2 parents 69f2aba + 86e600d commit d8b0845

7 files changed

+46
-44
lines changed

‎test/Frontend/bad-vfs-overlays.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: not %swift -c %s -vfsoverlay first-missing-overlay.yaml -vfsoverlay next-missing-overlay.yaml -vfsoverlay final-missing-overlay.yaml 2>&1 | %FileCheck %s -check-prefix=MISSING_VFS_OVERLAYS
22
// RUN: not %swift -c %s -vfsoverlay %S/Inputs/invalid-overlay.yaml 2>&1 | %FileCheck %s -check-prefix=INVALID_VFS_OVERLAY
33

4-
// MISSING_VFS_OVERLAYS: <unknown>:0: error: cannot open file '{{.*}}/first-missing-overlay.yaml' (No such file or directory)
5-
// MISSING_VFS_OVERLAYS-NEXT: <unknown>:0: error: cannot open file '{{.*}}/next-missing-overlay.yaml' (No such file or directory)
6-
// MISSING_VFS_OVERLAYS-NEXT: <unknown>:0: error: cannot open file '{{.*}}/final-missing-overlay.yaml' (No such file or directory)
4+
// MISSING_VFS_OVERLAYS: <unknown>:0: error: cannot open file '{{.*}}{{/|\\}}first-missing-overlay.yaml' ({{[Nn]}}o such file or directory)
5+
// MISSING_VFS_OVERLAYS-NEXT: <unknown>:0: error: cannot open file '{{.*}}{{/|\\}}next-missing-overlay.yaml' ({{[Nn]}}o such file or directory)
6+
// MISSING_VFS_OVERLAYS-NEXT: <unknown>:0: error: cannot open file '{{.*}}{{/|\\}}final-missing-overlay.yaml' ({{[Nn]}}o such file or directory)
77

8-
// INVALID_VFS_OVERLAY: <unknown>:0: error: invalid virtual overlay file '{{.*}}/invalid-overlay.yaml'
8+
// INVALID_VFS_OVERLAY: <unknown>:0: error: invalid virtual overlay file '{{.*}}{{/|\\}}invalid-overlay.yaml'

‎test/Frontend/batch_mode_output_file_map_missing_primary.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// RUN: %empty-directory(%t)
22
// RUN: echo 'print("Hello, World!")' >%t/main.swift
33
// RUN: touch %t/file-01.swift
4-
// RUN: (cd %t && not %target-swift-frontend -parse -primary-file main.swift -primary-file file-01.swift -supplementary-output-file-map %S/Inputs/supplementary_output_filemap_missing_a_primary.yaml >%t/errs.txt 2>&1)
4+
// RUN: cd %t
5+
// RUN: not %target-swift-frontend -parse -primary-file main.swift -primary-file file-01.swift -supplementary-output-file-map %S/Inputs/supplementary_output_filemap_missing_a_primary.yaml >%t/errs.txt 2>&1
56
// RUN: %FileCheck %s <%t/errs.txt
7+
68
// CHECK: error: supplementary output file map '{{.*}}supplementary_output_filemap_missing_a_primary.yaml' is missing an entry for 'file-01.swift' (this likely indicates a compiler issue; please file a bug report)

‎test/Frontend/batch_mode_output_file_map_yaml_parse_error.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// RUN: %empty-directory(%t)
22
// RUN: echo 'print("Hello, World!")' >%t/main.swift
3-
// RUN: (cd %t && not %target-swift-frontend -parse -primary-file main.swift -supplementary-output-file-map %S/Inputs/bad_output_filemap.yaml >%t/errs.txt 2>&1)
3+
// RUN: cd %t
4+
// RUN: not %target-swift-frontend -parse -primary-file main.swift -supplementary-output-file-map %S/Inputs/bad_output_filemap.yaml >%t/errs.txt 2>&1
45
// RUN: %FileCheck %s <%t/errs.txt
56
// CHECK: Unrecognized escape code
67
// CHECK: Output file map parse failed

‎test/Frontend/dependencies-preservation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// RUN: %empty-directory(%t)
77

88
// First, produce the dependency files and verify their contents.
9-
// RUN: %target-swift-frontend -emit-reference-dependencies-path %t.swiftdeps -typecheck -primary-file %S/../Inputs/empty\ file.swift
9+
// RUN: %target-swift-frontend -emit-reference-dependencies-path %t.swiftdeps -typecheck -primary-file "%S/../Inputs/empty file.swift"
1010
// RUN: %FileCheck -check-prefix=CHECK %s < %t.swiftdeps
1111

1212
// CHECK-LABEL: provides-top-level:

‎test/Frontend/dependencies.swift

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
1-
// XFAIL: linux
2-
31
// RUN: %empty-directory(%t)
42

5-
// RUN: %target-swift-frontend -emit-dependencies-path - -resolve-imports %S/../Inputs/empty\ file.swift | %FileCheck -check-prefix=CHECK-BASIC %s
6-
// RUN: %target-swift-frontend -emit-reference-dependencies-path - -typecheck -primary-file %S/../Inputs/empty\ file.swift | %FileCheck -check-prefix=CHECK-BASIC-YAML %s
3+
// RUN: %target-swift-frontend -emit-dependencies-path - -resolve-imports "%S/../Inputs/empty file.swift" | %FileCheck -check-prefix=CHECK-BASIC %s
4+
// RUN: %target-swift-frontend -emit-reference-dependencies-path - -typecheck -primary-file "%S/../Inputs/empty file.swift" | %FileCheck -check-prefix=CHECK-BASIC-YAML %s
75

8-
// RUN: %target-swift-frontend -emit-dependencies-path %t.d -emit-reference-dependencies-path %t.swiftdeps -typecheck -primary-file %S/../Inputs/empty\ file.swift
6+
// RUN: %target-swift-frontend -emit-dependencies-path %t.d -emit-reference-dependencies-path %t.swiftdeps -typecheck -primary-file "%S/../Inputs/empty file.swift"
97
// RUN: %FileCheck -check-prefix=CHECK-BASIC %s < %t.d
108
// RUN: %FileCheck -check-prefix=CHECK-BASIC-YAML %s < %t.swiftdeps
119

1210
// CHECK-BASIC-LABEL: - :
1311
// CHECK-BASIC: Inputs/empty\ file.swift
1412
// CHECK-BASIC: Swift.swiftmodule
15-
// CHECK-BASIC-NOT: :
13+
// CHECK-BASIC-NOT: {{[^\\]}}:
1614

1715
// CHECK-BASIC-YAML-LABEL: depends-external:
1816
// CHECK-BASIC-YAML-NOT: empty\ file.swift
19-
// CHECK-BASIC-YAML: "{{.*}}/Swift.swiftmodule"
17+
// CHECK-BASIC-YAML: "{{.*}}{{/|\\}}Swift.swiftmodule"
2018
// CHECK-BASIC-YAML-NOT: {{:$}}
2119

2220

23-
// RUN: %target-swift-frontend -emit-dependencies-path %t.d -emit-reference-dependencies-path %t.swiftdeps -typecheck %S/../Inputs/empty\ file.swift 2>&1 | %FileCheck -check-prefix=NO-PRIMARY-FILE %s
21+
// RUN: %target-swift-frontend -emit-dependencies-path %t.d -emit-reference-dependencies-path %t.swiftdeps -typecheck "%S/../Inputs/empty file.swift" 2>&1 | %FileCheck -check-prefix=NO-PRIMARY-FILE %s
2422

2523
// NO-PRIMARY-FILE: warning: ignoring -emit-reference-dependencies (requires -primary-file)
2624

2725

28-
// RUN: %target-swift-frontend -emit-dependencies-path - -emit-module %S/../Inputs/empty\ file.swift -o %t/empty\ file.swiftmodule -emit-module-doc-path %t/empty\ file.swiftdoc -emit-objc-header-path %t/empty\ file.h -emit-parseable-module-interface-path %t/empty\ file.swiftinterface | %FileCheck -check-prefix=CHECK-MULTIPLE-OUTPUTS %s
26+
// RUN: %target-swift-frontend -emit-dependencies-path - -emit-module "%S/../Inputs/empty file.swift" -o "%t/empty file.swiftmodule" -emit-module-doc-path "%t/empty file.swiftdoc" -emit-objc-header-path "%t/empty file.h" -emit-parseable-module-interface-path "%t/empty file.swiftinterface" | %FileCheck -check-prefix=CHECK-MULTIPLE-OUTPUTS %s
2927

3028
// CHECK-MULTIPLE-OUTPUTS-LABEL: empty\ file.swiftmodule :
3129
// CHECK-MULTIPLE-OUTPUTS: Inputs/empty\ file.swift
@@ -39,23 +37,23 @@
3937
// CHECK-MULTIPLE-OUTPUTS-LABEL: empty\ file.h :
4038
// CHECK-MULTIPLE-OUTPUTS: Inputs/empty\ file.swift
4139
// CHECK-MULTIPLE-OUTPUTS: Swift.swiftmodule
42-
// CHECK-MULTIPLE-OUTPUTS-NOT: :
40+
// CHECK-MULTIPLE-OUTPUTS-NOT: {{[^\\]}}:
4341

44-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-dependencies-path - -resolve-imports %s | %FileCheck -check-prefix=CHECK-IMPORT %s
45-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/dependencies/extra-header.h -track-system-dependencies -emit-dependencies-path - -resolve-imports %s | %FileCheck -check-prefix=CHECK-IMPORT-TRACK-SYSTEM %s
46-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-reference-dependencies-path - -typecheck -primary-file %s | %FileCheck -check-prefix=CHECK-IMPORT-YAML %s
42+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-dependencies-path - -resolve-imports %s | %FileCheck -check-prefix=CHECK-IMPORT %s
43+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/dependencies/extra-header.h -track-system-dependencies -emit-dependencies-path - -resolve-imports %s | %FileCheck -check-prefix=CHECK-IMPORT-TRACK-SYSTEM %s
44+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-reference-dependencies-path - -typecheck -primary-file %s | %FileCheck -check-prefix=CHECK-IMPORT-YAML %s
4745

4846
// CHECK-IMPORT-LABEL: - :
4947
// CHECK-IMPORT: dependencies.swift
5048
// CHECK-IMPORT-DAG: Swift.swiftmodule
5149
// CHECK-IMPORT-DAG: Inputs/dependencies/$$$$$$$$$$.h
52-
// CHECK-IMPORT-DAG: Inputs/dependencies/UserClangModule.h
50+
// CHECK-IMPORT-DAG: Inputs/dependencies{{/|\\}}UserClangModule.h
5351
// CHECK-IMPORT-DAG: Inputs/dependencies/extra-header.h
54-
// CHECK-IMPORT-DAG: Inputs/dependencies/module.modulemap
52+
// CHECK-IMPORT-DAG: Inputs/dependencies{{/|\\}}module.modulemap
5553
// CHECK-IMPORT-DAG: ObjectiveC.swift
5654
// CHECK-IMPORT-DAG: Foundation.swift
5755
// CHECK-IMPORT-DAG: CoreGraphics.swift
58-
// CHECK-IMPORT-NOT: :
56+
// CHECK-IMPORT-NOT: {{[^\\]}}:
5957

6058
// CHECK-IMPORT-TRACK-SYSTEM-LABEL: - :
6159
// CHECK-IMPORT-TRACK-SYSTEM: dependencies.swift
@@ -66,30 +64,30 @@
6664
// CHECK-IMPORT-TRACK-SYSTEM-DAG: Foundation.swift
6765
// CHECK-IMPORT-TRACK-SYSTEM-DAG: ObjectiveC.swift
6866
// CHECK-IMPORT-TRACK-SYSTEM-DAG: Inputs/dependencies/$$$$$$$$$$.h
69-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: Inputs/dependencies/UserClangModule.h
67+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: Inputs/dependencies{{/|\\}}UserClangModule.h
7068
// CHECK-IMPORT-TRACK-SYSTEM-DAG: Inputs/dependencies/extra-header.h
71-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: Inputs/dependencies/module.modulemap
72-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: swift/shims/module.modulemap
73-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr/include/CoreFoundation.h
74-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr/include/CoreGraphics.apinotes
75-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr/include/CoreGraphics.h
76-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr/include/Foundation.h
77-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr/include/objc/NSObject.h
78-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr/include/objc/ObjectiveC.apinotes
79-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr/include/objc/module.map
80-
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr/include/objc/objc.h
81-
// CHECK-IMPORT-TRACK-SYSTEM-NOT: :
69+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: Inputs/dependencies{{/|\\}}module.modulemap
70+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: swift{{/|\\}}shims{{/|\\}}module.modulemap
71+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr{{/|\\}}include{{/|\\}}CoreFoundation.h
72+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr{{/|\\}}include{{/|\\}}CoreGraphics.apinotes
73+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr{{/|\\}}include{{/|\\}}CoreGraphics.h
74+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr{{/|\\}}include{{/|\\}}Foundation.h
75+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr{{/|\\}}include{{/|\\}}objc{{/|\\}}NSObject.h
76+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr{{/|\\}}include{{/|\\}}objc{{/|\\}}ObjectiveC.apinotes
77+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr{{/|\\}}include{{/|\\}}objc{{/|\\}}module.map
78+
// CHECK-IMPORT-TRACK-SYSTEM-DAG: usr{{/|\\}}include{{/|\\}}objc{{/|\\}}objc.h
79+
// CHECK-IMPORT-TRACK-SYSTEM-NOT: {{[^\\]}}:
8280

8381
// CHECK-IMPORT-YAML-LABEL: depends-external:
8482
// CHECK-IMPORT-YAML-NOT: dependencies.swift
85-
// CHECK-IMPORT-YAML-DAG: "{{.*}}/Swift.swiftmodule"
83+
// CHECK-IMPORT-YAML-DAG: "{{.*}}{{/|\\}}Swift.swiftmodule"
8684
// CHECK-IMPORT-YAML-DAG: "{{.*}}Inputs/dependencies/$$$$$.h"
87-
// CHECK-IMPORT-YAML-DAG: "{{.*}}Inputs/dependencies/UserClangModule.h"
85+
// CHECK-IMPORT-YAML-DAG: "{{.*}}Inputs/dependencies{{/|\\\\}}UserClangModule.h"
8886
// CHECK-IMPORT-YAML-DAG: "{{.*}}Inputs/dependencies/extra-header.h"
89-
// CHECK-IMPORT-YAML-DAG: "{{.*}}Inputs/dependencies/module.modulemap"
90-
// CHECK-IMPORT-YAML-DAG: "{{.*}}/ObjectiveC.swift"
91-
// CHECK-IMPORT-YAML-DAG: "{{.*}}/Foundation.swift"
92-
// CHECK-IMPORT-YAML-DAG: "{{.*}}/CoreGraphics.swift"
87+
// CHECK-IMPORT-YAML-DAG: "{{.*}}Inputs/dependencies{{/|\\\\}}module.modulemap"
88+
// CHECK-IMPORT-YAML-DAG: "{{.*}}{{/|\\\\}}ObjectiveC.swift"
89+
// CHECK-IMPORT-YAML-DAG: "{{.*}}{{/|\\\\}}Foundation.swift"
90+
// CHECK-IMPORT-YAML-DAG: "{{.*}}{{/|\\\\}}CoreGraphics.swift"
9391
// CHECK-IMPORT-YAML-NOT: {{^-}}
9492
// CHECK-IMPORT-YAML-NOT: {{:$}}
9593

‎test/Frontend/embed-bitcode.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// UNSUPPORTED: OS=linux-gnu
99
// UNSUPPORTED: OS=linux-gnueabihf
1010
// UNSUPPORTED: OS=freebsd
11+
// UNSUPPORTED: OS=windows-msvc
1112

1213
// MARKER: Contents of (__LLVM,__bitcode) section
1314
// MARKER-NEXT: 00

‎test/Frontend/vfs.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfs/vfsoverlay.yaml > %t/overlay.yaml
3-
// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfs/secondary-vfsoverlay.yaml > %t/secondary-overlay.yaml
4-
// RUN: sed -e "s:INPUT_DIR:%S/Inputs:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfs/tertiary-vfsoverlay.yaml > %t/tertiary-overlay.yaml
2+
// RUN: sed -e "s|INPUT_DIR|%/S/Inputs|g" -e "s|OUT_DIR|%/t|g" %S/Inputs/vfs/vfsoverlay.yaml > %t/overlay.yaml
3+
// RUN: sed -e "s|INPUT_DIR|%/S/Inputs|g" -e "s|OUT_DIR|%/t|g" %S/Inputs/vfs/secondary-vfsoverlay.yaml > %t/secondary-overlay.yaml
4+
// RUN: sed -e "s|INPUT_DIR|%/S/Inputs|g" -e "s|OUT_DIR|%/t|g" %S/Inputs/vfs/tertiary-vfsoverlay.yaml > %t/tertiary-overlay.yaml
55

66
// RUN: not %target-swift-frontend -vfsoverlay %t/overlay.yaml -typecheck %s %t/mapped-file.swift -serialize-diagnostics-path %t/basic.dia 2>&1 | %FileCheck -check-prefix=BASIC_MAPPING_ERROR %s
77
// RUN: c-index-test -read-diagnostics %t/basic.dia 2>&1 | %FileCheck -check-prefix=BASIC_MAPPING_ERROR %s

0 commit comments

Comments
 (0)