[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 {