Merge pull request #30858 from rintaro/sourcekit-annotateddescription-fixtest-windows

rintaro · web-flow · commit c762db1a9eee · 2020-04-07T16:43:48.000-07:00
[CodeCompletion] Use --strip-trailing-cr for diff test
diff --git a/test/SourceKit/CodeComplete/complete_annotateddescription.swift b/test/SourceKit/CodeComplete/complete_annotateddescription.swift
@@ -11,4 +11,4 @@ func test(value: MyStruct) {
 }
 
 // RUN: %sourcekitd-test -req=complete -pos=10:8 -req-opts=annotateddescription=1 %s -- %s > %t.result
-// RUN: diff -u %s.result %t.result
+// RUN: diff --strip-trailing-cr -u %s.result %t.result

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@ func test(value: MyStruct) {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`// RUN: %sourcekitd-test -req=complete -pos=10:8 -req-opts=annotateddescription=1 %s -- %s > %t.result`
`14`		`-// RUN: diff -u %s.result %t.result`
	`14`	`+// RUN: diff --strip-trailing-cr -u %s.result %t.result`