Skip to content

Commit f16f72c

Browse files
nkcsgexinkcsgexi
committed
---
yaml --- r: 326431 b: refs/heads/master-next c: 6ec4fc8 h: refs/heads/master i: 326429: d9e4825 326427: 3a019e7 326423: 3607660 326415: 6b9c0d3 326399: 7607adc
1 parent 7489fbf commit f16f72c

File tree

6 files changed

+47
-6
lines changed

6 files changed

+47
-6
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: e052da7d8886fa0439677852e8f7830b20c2e1da
3-
refs/heads/master-next: 3103b5cec16b1f7e1314cb6afb2b4e115ed061b4
3+
refs/heads/master-next: 6ec4fc8ade92d3e7b94ee5221ffe0d88ea836ad2
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

‎branches/master-next/test/Driver/advanced_output_file_map.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
// DUMPOFM-NEXT: {{.*}}/advanced_output_file_map.swift -> swiftdoc: "/build/swiftmodule/advanced_output_file_map_x.swiftdoc"
2020
// DUMPOFM-NEXT: {{.*}}/advanced_output_file_map.swift -> diagnostics: "/build/dia/advanced_output_file_map.dia"
2121

22-
// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.EXE)?}}", inputs: ["{{.*}}/advanced_output_file_map.swift"], output: {object: "/build/obj/advanced_output_file_map.o", dependencies: "/build/d/advanced_output_file_map.d", swiftmodule: "/build/swiftmodule/advanced_output_file_map.swiftmodule", swiftdoc: "/build/swiftmodule/advanced_output_file_map_x.swiftdoc", diagnostics: "/build/dia/advanced_output_file_map.dia"}
23-
// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.EXE)?}}", inputs: ["{{.*}}/Inputs/main.swift"], output: {object: "/build/obj/main.o", dependencies: "/build/d/main.d", swiftmodule: "/build/swiftmodule/main.swiftmodule", swiftdoc: "/build/swiftmodule/main_x.swiftdoc", diagnostics: "/build/dia/main.dia"}
24-
// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.EXE)?}}", inputs: ["{{.*}}/Inputs/lib.swift"], output: {object: "/build/obj/lib.o", dependencies: "/build/d/lib.d", swiftmodule: "/build/swiftmodule/lib.swiftmodule", swiftdoc: "/build/swiftmodule/lib_x.swiftdoc", diagnostics: "/build/dia/lib.dia"}
25-
// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.EXE)?}}", inputs: ["/build/obj/advanced_output_file_map.o", "/build/obj/main.o", "/build/obj/lib.o"], output: {swiftmodule: "/build/OutputFileMap.swiftmodule", swiftdoc: "/build/OutputFileMap.swiftdoc"}
22+
// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.EXE)?}}", inputs: ["{{.*}}/advanced_output_file_map.swift"], output: {object: "/build/obj/advanced_output_file_map.o", dependencies: "/build/d/advanced_output_file_map.d", swiftmodule: "/build/swiftmodule/advanced_output_file_map.swiftmodule", swiftdoc: "/build/swiftmodule/advanced_output_file_map_x.swiftdoc", swiftsourceinfo: "/build/swiftmodule/advanced_output_file_map.swiftsourceinfo", diagnostics: "/build/dia/advanced_output_file_map.dia"}
23+
// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.EXE)?}}", inputs: ["{{.*}}/Inputs/main.swift"], output: {object: "/build/obj/main.o", dependencies: "/build/d/main.d", swiftmodule: "/build/swiftmodule/main.swiftmodule", swiftdoc: "/build/swiftmodule/main_x.swiftdoc", swiftsourceinfo: "/build/swiftmodule/main.swiftsourceinfo", diagnostics: "/build/dia/main.dia"}
24+
// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.EXE)?}}", inputs: ["{{.*}}/Inputs/lib.swift"], output: {object: "/build/obj/lib.o", dependencies: "/build/d/lib.d", swiftmodule: "/build/swiftmodule/lib.swiftmodule", swiftdoc: "/build/swiftmodule/lib_x.swiftdoc", swiftsourceinfo: "/build/swiftmodule/lib.swiftsourceinfo", diagnostics: "/build/dia/lib.dia"}
25+
// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.EXE)?}}", inputs: ["/build/obj/advanced_output_file_map.o", "/build/obj/main.o", "/build/obj/lib.o"], output: {swiftmodule: "/build/OutputFileMap.swiftmodule", swiftdoc: "/build/OutputFileMap.swiftdoc", swiftsourceinfo: "/build/OutputFileMap.swiftsourceinfo"}
2626
// BINDINGS: # "x86_64-apple-macosx10.9" - "ld{{(.exe)?}}", inputs: ["/build/obj/advanced_output_file_map.o", "/build/obj/main.o", "/build/obj/lib.o", "/build/OutputFileMap.swiftmodule"], output: {image: "/build/advanced_output_file_map.out"}
2727
// BINDINGS: # "x86_64-apple-macosx10.9" - "dsymutil{{(\.exe)?}}", inputs: ["/build/advanced_output_file_map.out"], output: {dSYM: "/build/advanced_output_file_map.out.dSYM"}

‎branches/master-next/test/Driver/batch_mode_parseable_output.swift

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
// CHECK-NEXT: {
4444
// CHECK-NEXT: "type": "swiftdoc",
4545
// CHECK-NEXT: "path": "{{.*[\\/]}}file-01-[[SWIFTDOC01]].swiftdoc"
46+
// CHECK-NEXT: },
47+
// CHECK-NEXT: {
48+
// CHECK-NEXT: "type": "swiftsourceinfo",
49+
// CHECK-NEXT: "path": "{{.*[\\/]}}file-01-[[MODULE01]].swiftsourceinfo"
4650
// CHECK-NEXT: }
4751
// CHECK-NEXT: ],
4852
// CHECK-NEXT: "pid": -{{[1-9][0-9]*}},
@@ -88,6 +92,10 @@
8892
// CHECK-NEXT: {
8993
// CHECK-NEXT: "type": "swiftdoc",
9094
// CHECK-NEXT: "path": "{{.*[\\/]}}file-02-[[SWIFTDOC02]].swiftdoc"
95+
// CHECK-NEXT: },
96+
// CHECK-NEXT: {
97+
// CHECK-NEXT: "type": "swiftsourceinfo",
98+
// CHECK-NEXT: "path": "{{.*[\\/]}}file-02-[[MODULE02]].swiftsourceinfo"
9199
// CHECK-NEXT: }
92100
// CHECK-NEXT: ],
93101
// CHECK-NEXT: "pid": -{{[1-9][0-9]*}},
@@ -133,6 +141,10 @@
133141
// CHECK-NEXT: {
134142
// CHECK-NEXT: "type": "swiftdoc",
135143
// CHECK-NEXT: "path": "{{.*[\\/]}}file-03-[[SWIFTDOC03]].swiftdoc"
144+
// CHECK-NEXT: },
145+
// CHECK-NEXT: {
146+
// CHECK-NEXT: "type": "swiftsourceinfo",
147+
// CHECK-NEXT: "path": "{{.*[\\/]}}file-03-[[MODULE03]].swiftsourceinfo"
136148
// CHECK-NEXT: }
137149
// CHECK-NEXT: ],
138150
// CHECK-NEXT: "pid": -{{[1-9][0-9]*}},
@@ -178,6 +190,10 @@
178190
// CHECK-NEXT: {
179191
// CHECK-NEXT: "type": "swiftdoc",
180192
// CHECK-NEXT: "path": "{{.*[\\/]}}main-[[SWIFTDOCMAIN]].swiftdoc"
193+
// CHECK-NEXT: },
194+
// CHECK-NEXT: {
195+
// CHECK-NEXT: "type": "swiftsourceinfo",
196+
// CHECK-NEXT: "path": "{{.*[\\/]}}main-[[MODULEMAIN]].swiftsourceinfo"
181197
// CHECK-NEXT: }
182198
// CHECK-NEXT: ],
183199
// CHECK-NEXT: "pid": -{{[1-9][0-9]*}},
@@ -233,7 +249,7 @@
233249
// CHECK-NEXT: {
234250
// CHECK-NEXT: "kind": "began",
235251
// CHECK-NEXT: "name": "merge-module",
236-
// CHECK-NEXT: "command": "{{.*[\\/]}}swift{{c?(\.EXE)?(\\")?}} -frontend -merge-modules -emit-module {{.*[\\/]}}file-01-[[MODULE01]].swiftmodule{{(\\")?}} {{.*[\\/]}}file-02-[[MODULE02]].swiftmodule{{(\\")?}} {{.*[\\/]}}file-03-[[MODULE03]].swiftmodule{{(\\")?}} {{.*[\\/]}}main-[[MODULEMAIN]].swiftmodule{{(\\")?}} {{.*}} -emit-module-doc-path main.swiftdoc -module-name main -o main.swiftmodule",
252+
// CHECK-NEXT: "command": "{{.*[\\/]}}swift{{c?(\.EXE)?(\\")?}} -frontend -merge-modules -emit-module {{.*[\\/]}}file-01-[[MODULE01]].swiftmodule{{(\\")?}} {{.*[\\/]}}file-02-[[MODULE02]].swiftmodule{{(\\")?}} {{.*[\\/]}}file-03-[[MODULE03]].swiftmodule{{(\\")?}} {{.*[\\/]}}main-[[MODULEMAIN]].swiftmodule{{(\\")?}} {{.*}} -emit-module-doc-path main.swiftdoc -emit-module-source-info-path main.swiftsourceinfo -module-name main -o main.swiftmodule",
237253
// CHECK-NEXT: "command_executable": "{{.*[\\/]}}swift{{c?(\.EXE)?}}",
238254
// CHECK-NEXT: "command_arguments": [
239255
// CHECK-NEXT: "-frontend",
@@ -245,6 +261,8 @@
245261
// CHECK-NEXT: "{{.*[\\/]}}main-[[MODULEMAIN]].swiftmodule",
246262
// CHECK: "-emit-module-doc-path",
247263
// CHECK-NEXT: "main.swiftdoc",
264+
// CHECK: "-emit-module-source-info-path",
265+
// CHECK-NEXT: "main.swiftsourceinfo",
248266
// CHECK-NEXT: "-module-name",
249267
// CHECK-NEXT: "main",
250268
// CHECK-NEXT: "-o",
@@ -264,6 +282,10 @@
264282
// CHECK-NEXT: {
265283
// CHECK-NEXT: "type": "swiftdoc",
266284
// CHECK-NEXT: "path": "main.swiftdoc"
285+
// CHECK-NEXT: },
286+
// CHECK-NEXT: {
287+
// CHECK-NEXT: "type": "swiftsourceinfo",
288+
// CHECK-NEXT: "path": "main.swiftsourceinfo"
267289
// CHECK-NEXT: }
268290
// CHECK-NEXT: ],
269291
// CHECK-NEXT: "pid": {{[1-9][0-9]*}},

‎branches/master-next/test/Driver/filelists.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@
88
// CHECK: Handled a.swift
99
// CHECK-NEXT: Supplementary swiftdoc: "./a.swiftdoc"
1010
// CHECK-NEXT: Supplementary swiftmodule: "./a.swiftmodule"
11+
// CHECK-NEXT: Supplementary swiftsourceinfo: "./a.swiftsourceinfo"
1112
// CHECK-NEXT: Supplementary "./a.swift":
1213
// CHECK-NEXT: Handled b.swift
1314
// CHECK-NEXT: Supplementary swiftdoc: "./b.swiftdoc"
1415
// CHECK-NEXT: Supplementary swiftmodule: "./b.swiftmodule"
16+
// CHECK-NEXT: Supplementary swiftsourceinfo: "./b.swiftsourceinfo"
1517
// CHECK-NEXT: Supplementary "./b.swift":
1618
// CHECK-NEXT: Handled c.swift
1719
// CHECK-NEXT: Supplementary swiftdoc: "./c.swiftdoc"
1820
// CHECK-NEXT: Supplementary swiftmodule: "./c.swiftmodule"
21+
// CHECK-NEXT: Supplementary swiftsourceinfo: "./c.swiftsourceinfo"
1922
// CHECK-NEXT: Supplementary "./c.swift":
2023
// CHECK-NEXT: Handled modules
2124
// CHECK-NOT: Handled

‎branches/master-next/test/Driver/parseable_output.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
// CHECK-NEXT: "path": "{{.*[\\/]}}parseable_output-[[OUTPUT]].swiftdoc"
3838
// CHECK-NEXT: },
3939
// CHECK-NEXT: {
40+
// CHECK-NEXT: "type": "swiftsourceinfo",
41+
// CHECK-NEXT: "path": "{{.*[\\/]}}parseable_output-[[OUTPUT]].swiftsourceinfo"
42+
// CHECK-NEXT: },
43+
// CHECK-NEXT: {
4044
// CHECK-NEXT: "type": "diagnostics",
4145
// CHECK-NEXT: "path": "{{.*[\\/]}}parseable_output-[[OUTPUT]].dia"
4246
// CHECK-NEXT: }
@@ -86,6 +90,10 @@
8690
// CHECK-NEXT: "path": "{{.*[\\/]}}parseable_output.swift.tmp.swiftdoc"
8791
// CHECK-NEXT: },
8892
// CHECK-NEXT: {
93+
// CHECK-NEXT: "type": "swiftsourceinfo",
94+
// CHECK-NEXT: "path": "{{.*[\\/]}}parseable_output.swift.tmp.swiftsourceinfo"
95+
// CHECK-NEXT: },
96+
// CHECK-NEXT: {
8997
// CHECK-NEXT: "type": "objc-header",
9098
// CHECK-NEXT: "path": "{{.*[\\/]}}parseable_output.swift.tmp.h"
9199
// CHECK-NEXT: }

‎branches/master-next/test/Driver/parseable_output_unicode.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
// CHECK-NEXT: "path": "{{.*[\\/]}}你好-[[OUTPUT]].swiftdoc"
4040
// CHECK-NEXT: },
4141
// CHECK-NEXT: {
42+
// CHECK-NEXT: "type": "swiftsourceinfo",
43+
// CHECK-NEXT: "path": "{{.*[\\/]}}你好-[[OUTPUT]].swiftsourceinfo"
44+
// CHECK-NEXT: },
45+
// CHECK-NEXT: {
4246
// CHECK-NEXT: "type": "diagnostics",
4347
// CHECK-NEXT: "path": "{{.*[\\/]}}你好-[[OUTPUT]].dia"
4448
// CHECK-NEXT: }
@@ -88,6 +92,10 @@
8892
// CHECK-NEXT: "path": "{{.*[\\/]}}parseable_output_unicode.swift.tmp.swiftdoc"
8993
// CHECK-NEXT: },
9094
// CHECK-NEXT: {
95+
// CHECK-NEXT: "type": "swiftsourceinfo",
96+
// CHECK-NEXT: "path": "{{.*[\\/]}}parseable_output_unicode.swift.tmp.swiftsourceinfo"
97+
// CHECK-NEXT: },
98+
// CHECK-NEXT: {
9199
// CHECK-NEXT: "type": "objc-header",
92100
// CHECK-NEXT: "path": "{{.*[\\/]}}parseable_output_unicode.swift.tmp.h"
93101
// CHECK-NEXT: }

0 commit comments

Comments
 (0)