Merge pull request swiftlang#30890 from rintaro/sourcekit-test-diff

[SourceKit/Testing] Add %diff as an alias for 'diff --strip-trailing-cr'

Author: rintaro

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 --strip-trailing-cr -u %s.result %t.result
+// RUN: %diff -u %s.result %t.result

test/SourceKit/CodeComplete/complete_constructor.swift

@@ -7,4 +7,4 @@ class Foo {
 Foo(
 
 // RUN: %sourcekitd-test -req=complete -pos=7:5 %s -- %s > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response

test/SourceKit/CodeComplete/complete_filter.swift

@@ -34,7 +34,7 @@ func foo() {
 // RUN: %sourcekitd-test -req=complete.open -pos=11:5 %s -- %s \
 // RUN:   == -req=complete.update -pos=11:5 -req-opts=filtertext=a %s -- %s > %t.both
 // RUN: cat %t.all %t.a > %t.both.check
-// RUN: diff -u %t.both %t.both.check
+// RUN: %diff -u %t.both %t.both.check
 
 // RUN: %sourcekitd-test -req=complete.open -pos=11:5 \
 // RUN:   -req-opts=filtertext=b %s -- %s > %t.b

test/SourceKit/CodeComplete/complete_member.swift

@@ -40,7 +40,7 @@ func testOverrideUSR() {
 }
 
 // RUN: %sourcekitd-test -req=complete -pos=15:5 %s -- %s > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 //
 // RUN: %sourcekitd-test -req=complete -pos=19:5 %s -- %s | %FileCheck %s -check-prefix=CHECK-OPTIONAL
 // RUN: %sourcekitd-test -req=complete.open -pos=19:5 %s -- %s | %FileCheck %s -check-prefix=CHECK-OPTIONAL-OPEN

test/SourceKit/CodeComplete/complete_optionalmethod.swift

@@ -7,5 +7,5 @@ func test<T : Proto>(obj: T) {
 }
 
 // RUN: %sourcekitd-test -req=complete -pos=6:15 %s -- %s > %t.response
-// RUN: diff -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 // REQUIRES: objc_interop

test/SourceKit/CodeComplete/complete_override.swift

@@ -6,5 +6,5 @@ class Derived : Base {
 }
 
 // RUN: %sourcekitd-test -req=complete -pos=5:1 %s -- %s > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 

test/SourceKit/CodeComplete/complete_sort_order.swift

@@ -12,7 +12,7 @@ func test() {
 // RUN: %sourcekitd-test -req=complete -req-opts=hidelowpriority=0,sort.byname=0 -pos=7:1 %s -- %s > %t.orig.off
 // RUN: %FileCheck -check-prefix=NAME_SORTED %s < %t.orig
 // RUN: %FileCheck -check-prefix=NAME_UNSORTED %s < %t.orig.off
-// RUN: not diff -u %t.orig %t.orig.off
+// RUN: not %diff -u %t.orig %t.orig.off
 
 // Make sure the order is as below, foo(Int) should come before foo(String).
 // NAME_SORTED: key.description: "#column"

test/SourceKit/CodeComplete/complete_typerelation.swift

@@ -31,10 +31,10 @@ func testUnknown() {
 }
 
 // RUN: %sourcekitd-test -req=complete -pos=13:17 %s -- %s > %t.identical.response
-// RUN: diff --strip-trailing-cr -u %s.identical.response %t.identical.response
+// RUN: %diff -u %s.identical.response %t.identical.response
 
 // RUN: %sourcekitd-test -req=complete -pos=17:17 %s -- %s > %t.convertible.response
-// RUN: diff --strip-trailing-cr -u %s.convertible.response %t.convertible.response
+// RUN: %diff -u %s.convertible.response %t.convertible.response
 
 // RUN: %empty-directory(%t/cache)
 // RUN: %sourcekitd-test -req=complete.cache.ondisk -cache-path %t/cache == -req=complete -pos=21:10 %s -- %s | %FileCheck %s --check-prefix=BOOLCONTEXT

test/SourceKit/CodeComplete/complete_unresolvedmember.swift

@@ -12,5 +12,5 @@ func test() -> Foo {
 }
 
 // RUN: %sourcekitd-test -req=complete -pos=11:11 %s -- %s > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 

test/SourceKit/CodeComplete/complete_update.swift

@@ -22,7 +22,7 @@ func foo() {
 // CHECK: key.kind: source.lang.swift.codecomplete.group
 
 // RUN: cat %t.open %t.open %t.open > %t.check
-// RUN: diff -u %t.update %t.check
+// RUN: %diff -u %t.update %t.check
 
 
 struct X {

test/SourceKit/ConformingMethods/basic.swift

@@ -27,4 +27,4 @@ func testing(obj: C) {
 }
 
 // RUN: %sourcekitd-test -req=conformingmethods -pos=26:14 %s -req-opts=expectedtypes='$s8MyModule7Target2PD;$s8MyModule7Target1PD' -- -module-name MyModule %s > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response

test/SourceKit/ConformingMethods/generics.swift

@@ -18,6 +18,6 @@ func test<X>(value: S<X>) {
 }
 
 // RUN: %sourcekitd-test -req=conformingmethods -pos=12:10 %s -req-opts=expectedtypes='$s8MyModule5ProtoPD' -- -module-name MyModule %s > %t.response.1
-// RUN: diff --strip-trailing-cr -u %s.response.1 %t.response.1
+// RUN: %diff -u %s.response.1 %t.response.1
 // RUN: %sourcekitd-test -req=conformingmethods -pos=17:8 %s -req-opts=expectedtypes='$s8MyModule5ProtoPD' -- -module-name MyModule %s > %t.response.2
-// RUN: diff --strip-trailing-cr -u %s.response.2 %t.response.2
+// RUN: %diff -u %s.response.2 %t.response.2

test/SourceKit/CursorInfo/cursor_usr.swift

@@ -15,7 +15,7 @@ func foo(x: FooStruct1) -> S1 {}
 // RUN: %sourcekitd-test -req=cursor -usr "s:10cursor_usr2S1V" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %s > %t.from_usr.txt
 // RUN: %FileCheck %s -check-prefix=CHECK_SANITY1 < %t.from_offset.txt
 // RUN: %FileCheck %s -check-prefix=CHECK_SANITY1 < %t.from_usr.txt
-// RUN: diff -u %t.from_usr.txt %t.from_offset.txt
+// RUN: %diff -u %t.from_usr.txt %t.from_offset.txt
 // CHECK_SANITY1: source.lang.swift.decl.struct (5:8-5:10)
 // CHECK_SANITY1-NEXT: S1
 // CHECK_SANITY1-NEXT: s:10cursor_usr2S1

test/SourceKit/CursorInfo/rdar_18677108-2.swift

@@ -2,7 +2,7 @@
 // RUN:                               --  %S/Inputs/rdar_18677108-2-b.swift \
 // RUN:                                   %S/Inputs/rdar_18677108-2-a.swift \
 // RUN:               == -req=print-diags %S/Inputs/rdar_18677108-2-a.swift | %sed_clean > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 
 
 

test/SourceKit/DocSupport/doc_clang_module.swift

@@ -8,4 +8,4 @@
 
 // RUN: %sourcekitd-test -req=doc-info -module Foo -- -F %S/../Inputs/libIDE-mock-sdk \
 // RUN:         -target %target-triple %clang-importer-sdk-nosource -I %t | %sed_clean > %t.response
-// RUN: diff -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response

test/SourceKit/DocSupport/doc_source_file.swift

@@ -1,5 +1,5 @@
 // RUN: %sourcekitd-test -req=doc-info %S/Inputs/main.swift > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 
 // RUN: not %sourcekitd-test -req=doc-info %S/Inputs/main.swift -- %S/Inputs/cake.swift 2> %t.error
 // RUN: %FileCheck %s -check-prefix=MULTI_FILE < %t.error

test/SourceKit/DocSupport/doc_swift_module.swift

@@ -1,4 +1,4 @@
 // RUN: %empty-directory(%t.mod)
 // RUN: %swift -emit-module -o %t.mod/cake.swiftmodule %S/Inputs/cake.swift -parse-as-library  -enable-objc-interop -emit-module-doc-path %t.mod/cake.swiftdoc
 // RUN: %sourcekitd-test -req=doc-info -module cake -- -I %t.mod > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response

test/SourceKit/DocSupport/doc_swift_module1.swift

@@ -1,4 +1,4 @@
 // RUN: %empty-directory(%t.mod)
 // RUN: %swift -emit-module -o %t.mod/cake1.swiftmodule %S/Inputs/cake1.swift -parse-as-library
 // RUN: %sourcekitd-test -req=doc-info -module cake1 -- -I %t.mod > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response

test/SourceKit/DocSupport/doc_swift_module_cross_import.swift

@@ -4,11 +4,11 @@
 // Check doc info shows the decls from each of A's cross-import overlays and lists the required bystander modules.
 //
 // RUN: %sourcekitd-test -req=doc-info -module A -- -I %S/../Inputs/CrossImport -module-cache-path %t.mod/mcp > %t.response
-// RUN: diff --strip-trailing-cr -u %s.A.response %t.response
+// RUN: %diff -u %s.A.response %t.response
 
 // Set up a cross-import module with doc comments and check the synthesized comments don't appear in the fully_annotated_decl entries.
 //
 // RUN: %target-swift-frontend -emit-module-path %t.mod/_OtherCAdditions.swiftmodule -emit-module-doc-path %t.mod/_OtherCAdditions.swiftdoc -module-cache-path %t.mod/mcp -I %S/../Inputs/CrossImport %S/../Inputs/CrossImport/_OtherCAdditions.swift -parse-as-library -enable-cross-import-overlays
 // RUN: %sourcekitd-test -req=doc-info -module Other -- -target %target-triple -I %S/../Inputs/CrossImport -I %t.mod/ -module-cache-path %t.mod/mcp > %t.response
-// RUN: diff --strip-trailing-cr -u %s.Other.response %t.response
+// RUN: %diff -u %s.Other.response %t.response
 

test/SourceKit/DocumentStructure/access_parse.swift

@@ -1,3 +1,3 @@
 // RUN: %swift -typecheck %S/Inputs/access.swift
 // RUN: %sourcekitd-test -req=structure %S/Inputs/access.swift -- -module-name Access %S/Inputs/access.swift > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response

test/SourceKit/DocumentStructure/mark_edit.swift

@@ -1,2 +1,2 @@
 // RUN: %sourcekitd-test -req=structure -pos=1:1 -length=0 -replace=" " %S/Inputs/mark.swift > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response

test/SourceKit/DocumentStructure/structure.swift

@@ -1,14 +1,14 @@
 // RUN: %sourcekitd-test -req=structure %S/Inputs/main.swift -- -module-name StructureTest %S/Inputs/main.swift | %sed_clean > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 
 // RUN: %sourcekitd-test -req=structure %S/Inputs/invalid.swift | %sed_clean > %t.invalid.response
-// RUN: diff --strip-trailing-cr -u %s.invalid.response %t.invalid.response
+// RUN: %diff -u %s.invalid.response %t.invalid.response
 
 // RUN: %sourcekitd-test -req=structure %S/../Inputs/placeholders.swift | %sed_clean > %t.placeholders.response
-// RUN: diff --strip-trailing-cr -u %s.placeholders.response %t.placeholders.response
+// RUN: %diff -u %s.placeholders.response %t.placeholders.response
 
 // RUN: %sourcekitd-test -req=structure %S/Inputs/main.swift -name -foobar | %sed_clean > %t.foobar.response
-// RUN: diff --strip-trailing-cr -u %s.foobar.response %t.foobar.response
+// RUN: %diff -u %s.foobar.response %t.foobar.response
 
 // RUN: %sourcekitd-test -req=structure -text-input %S/Inputs/main.swift | %sed_clean > %t.empty.response
-// RUN: diff --strip-trailing-cr -u %s.empty.response %t.empty.response
+// RUN: %diff -u %s.empty.response %t.empty.response

test/SourceKit/DocumentStructure/structure_object_literals.swift

@@ -1,5 +1,5 @@
 // RUN: %sourcekitd-test -req=structure %s -- -module-name StructureTest %s | %sed_clean > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 
 let color: S = #colorLiteral(red: 1, green: 0, blue: 0, alpha: 1)
 let image: I? = #imageLiteral(resourceName: "hello.png")

test/SourceKit/DocumentStructure/structure_object_literals.swift.response

@@ -1,66 +1,66 @@
 {
   key.offset: 0,
-  key.length: 287,
+  key.length: 268,
   key.diagnostic_stage: source.diagnostic.stage.swift.parse,
   key.substructure: [
     {
       key.kind: source.lang.swift.decl.var.global,
       key.accessibility: source.lang.swift.accessibility.internal,
       key.name: "color",
-      key.offset: 164,
+      key.offset: 145,
       key.length: 65,
       key.typename: "S",
-      key.nameoffset: 168,
+      key.nameoffset: 149,
       key.namelength: 5
     },
     {
       key.kind: source.lang.swift.expr.object_literal,
       key.name: "colorLiteral",
-      key.offset: 179,
+      key.offset: 160,
       key.length: 50,
-      key.nameoffset: 180,
+      key.nameoffset: 161,
       key.namelength: 12,
-      key.bodyoffset: 192,
+      key.bodyoffset: 173,
       key.bodylength: 36,
       key.substructure: [
         {
           key.kind: source.lang.swift.expr.argument,
           key.name: "red",
-          key.offset: 193,
+          key.offset: 174,
           key.length: 6,
-          key.nameoffset: 193,
+          key.nameoffset: 174,
           key.namelength: 3,
-          key.bodyoffset: 198,
+          key.bodyoffset: 179,
           key.bodylength: 1
         },
         {
           key.kind: source.lang.swift.expr.argument,
           key.name: "green",
-          key.offset: 201,
+          key.offset: 182,
           key.length: 8,
-          key.nameoffset: 201,
+          key.nameoffset: 182,
           key.namelength: 5,
-          key.bodyoffset: 208,
+          key.bodyoffset: 189,
           key.bodylength: 1
         },
         {
           key.kind: source.lang.swift.expr.argument,
           key.name: "blue",
-          key.offset: 211,
+          key.offset: 192,
           key.length: 7,
-          key.nameoffset: 211,
+          key.nameoffset: 192,
           key.namelength: 4,
-          key.bodyoffset: 217,
+          key.bodyoffset: 198,
           key.bodylength: 1
         },
         {
           key.kind: source.lang.swift.expr.argument,
           key.name: "alpha",
-          key.offset: 220,
+          key.offset: 201,
           key.length: 8,
-          key.nameoffset: 220,
+          key.nameoffset: 201,
           key.namelength: 5,
-          key.bodyoffset: 227,
+          key.bodyoffset: 208,
           key.bodylength: 1
         }
       ]
@@ -69,30 +69,30 @@
       key.kind: source.lang.swift.decl.var.global,
       key.accessibility: source.lang.swift.accessibility.internal,
       key.name: "image",
-      key.offset: 230,
+      key.offset: 211,
       key.length: 56,
       key.typename: "I?",
-      key.nameoffset: 234,
+      key.nameoffset: 215,
       key.namelength: 5
     },
     {
       key.kind: source.lang.swift.expr.object_literal,
       key.name: "imageLiteral",
-      key.offset: 246,
+      key.offset: 227,
       key.length: 40,
-      key.nameoffset: 247,
+      key.nameoffset: 228,
       key.namelength: 12,
-      key.bodyoffset: 259,
+      key.bodyoffset: 240,
       key.bodylength: 26,
       key.substructure: [
         {
           key.kind: source.lang.swift.expr.argument,
           key.name: "resourceName",
-          key.offset: 260,
+          key.offset: 241,
           key.length: 25,
-          key.nameoffset: 260,
+          key.nameoffset: 241,
           key.namelength: 12,
-          key.bodyoffset: 274,
+          key.bodyoffset: 255,
           key.bodylength: 11
         }
       ]

test/SourceKit/ExtractComment/extract_comments.swift

@@ -1,28 +1,28 @@
 // RUN: %sourcekitd-test -req=extract-comment -pass-as-sourcetext %S/Inputs/DocComment1.swift > %t.DocComment1.response
-// RUN: diff --strip-trailing-cr -u %s.DocComment1.response %t.DocComment1.response
+// RUN: %diff -u %s.DocComment1.response %t.DocComment1.response
 
 // RUN: %sourcekitd-test -req=extract-comment -pass-as-sourcetext %S/Inputs/DocComment2.swift > %t.DocComment2.response
-// RUN: diff --strip-trailing-cr -u %s.DocComment2.response %t.DocComment2.response
+// RUN: %diff -u %s.DocComment2.response %t.DocComment2.response
 
 // RUN: %sourcekitd-test -req=extract-comment -pass-as-sourcetext %S/Inputs/DocComment3.swift > %t.DocComment3.response
-// RUN: diff --strip-trailing-cr -u %s.DocComment3.response %t.DocComment3.response
+// RUN: %diff -u %s.DocComment3.response %t.DocComment3.response
 
 // RUN: %sourcekitd-test -req=extract-comment -pass-as-sourcetext %S/Inputs/DocCommentEmptyLine1.swift > %t.DocCommentEmptyLine1.response
-// RUN: diff --strip-trailing-cr -u %s.DocCommentEmptyLine1.response %t.DocCommentEmptyLine1.response
+// RUN: %diff -u %s.DocCommentEmptyLine1.response %t.DocCommentEmptyLine1.response
 
 // RUN: %sourcekitd-test -req=extract-comment -pass-as-sourcetext %S/Inputs/DocCommentEmptyLine2.swift > %t.DocCommentEmptyLine2.response
-// RUN: diff --strip-trailing-cr -u %s.DocCommentEmptyLine2.response %t.DocCommentEmptyLine2.response
+// RUN: %diff -u %s.DocCommentEmptyLine2.response %t.DocCommentEmptyLine2.response
 
 // RUN: %sourcekitd-test -req=extract-comment -pass-as-sourcetext %S/Inputs/DocCommentEmptyLine3.swift > %t.DocCommentEmptyLine3.response
-// RUN: diff --strip-trailing-cr -u %s.DocCommentEmptyLine3.response %t.DocCommentEmptyLine3.response
+// RUN: %diff -u %s.DocCommentEmptyLine3.response %t.DocCommentEmptyLine3.response
 
 // RUN: %sourcekitd-test -req=extract-comment -pass-as-sourcetext %S/Inputs/Comment1.swift > %t.Comment1.response
-// RUN: diff --strip-trailing-cr -u %s.Comment1.response %t.Comment1.response
+// RUN: %diff -u %s.Comment1.response %t.Comment1.response
 
 // RUN: %sourcekitd-test -req=extract-comment -pass-as-sourcetext %S/Inputs/CommentIndent1.swift > %t.CommentIndent1.response
-// RUN: diff --strip-trailing-cr -u %s.CommentIndent1.response %t.CommentIndent1.response
+// RUN: %diff -u %s.CommentIndent1.response %t.CommentIndent1.response
 
 // RUN: %sourcekitd-test -req=extract-comment -pass-as-sourcetext %S/Inputs/CommentIndent2.swift > %t.CommentIndent2.response
-// RUN: diff --strip-trailing-cr -u %s.CommentIndent2.response %t.CommentIndent2.response
+// RUN: %diff -u %s.CommentIndent2.response %t.CommentIndent2.response
 
 // RUN: %sourcekitd-test -req=extract-comment -pass-as-sourcetext %S/Inputs/NotComment1.swift

test/SourceKit/Indexing/index.swift

@@ -1,5 +1,5 @@
 // RUN: %sourcekitd-test -req=index %s -- -Xfrontend -serialize-diagnostics-path -Xfrontend %t.dia %s | %sed_clean | sed -e 's/key.usr: \".*\"/key.usr: <usr>/g' > %t.response
-// RUN: diff -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 
 var globV: Int
 

test/SourceKit/Indexing/index_bad_modulename.swift

@@ -1,9 +1,9 @@
 // RUN: %empty-directory(%t)
 // RUN: %build-clang-importer-objc-overlays
 // RUN: %sourcekitd-test -req=index %s -- %s -module-name Swift -target %target-triple %clang-importer-sdk-nosource -I %t | %sed_clean > %t.response1
-// RUN: diff -u %s.response %t.response1
+// RUN: %diff -u %s.response %t.response1
 // RUN: %sourcekitd-test -req=index %s -- %s -module-name 12345 -target %target-triple %clang-importer-sdk-nosource -I %t | %sed_clean > %t.response2
-// RUN: diff -u %s.response %t.response2
+// RUN: %diff -u %s.response %t.response2
 
 import ObjectiveC
 let v: NSObject?

test/SourceKit/Indexing/index_big_array.swift

@@ -1,2 +1,2 @@
 // RUN: %sourcekitd-test -req=index %S/../Inputs/big_array.swift -- %S/../Inputs/big_array.swift | %sed_clean > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response

test/SourceKit/Indexing/index_constructors.swift

@@ -1,7 +1,7 @@
 // REQUIRES: objc_interop
 
 // RUN: %sourcekitd-test -req=index %s -- %s %S/Inputs/index_constructors_other.swift -module-name index_constructors | %sed_clean > %t.response
-// RUN: diff -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 
 import Foundation
 

test/SourceKit/Indexing/index_enum_case.swift

@@ -1,5 +1,5 @@
 // RUN: %sourcekitd-test -req=index %s -- -Xfrontend -serialize-diagnostics-path -Xfrontend %t.dia %s | %sed_clean > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response
 
 public enum E {
 

test/SourceKit/Indexing/index_forbid_typecheck.swift

@@ -1,2 +1,2 @@
 // RUN: %sourcekitd-test -req=index %S/../Inputs/forbid_typecheck_primary.swift -- -Xfrontend -debug-forbid-typecheck-prefix -Xfrontend NOTYPECHECK %S/../Inputs/forbid_typecheck_2.swift %S/../Inputs/forbid_typecheck_primary.swift -module-name forbid_typecheck | %sed_clean > %t.response
-// RUN: diff --strip-trailing-cr -u %s.response %t.response
+// RUN: %diff -u %s.response %t.response