[test/index] Make matching for unit depedency printing less strict

This makes the tests more focused on what they are interested in testing
and allows flexibility on changing dependency printing on the clang side
without breaking the swift tests.

Author: akyrtzi

test/Index/Store/unit-from-compile.swift

@@ -17,7 +17,7 @@
 // CHECK: is-debug: 1
 
 // CHECK: DEPEND START
-// CHECK: Unit | system | {{.*}}/Swift.swiftmodule |
+// CHECK: Unit | system | {{.*}}/Swift.swiftmodule
 // CHECK: DEPEND END (1)
 
 // OPT: is-debug: 1

test/Index/Store/unit-multiple-sourcefiles.swift

@@ -22,12 +22,12 @@
 // CHECK: --------
 // CHECK: out-file: {{.*}}s1.o
 // CHECK: DEPEND START
-// CHECK: Unit | system | {{.*}}Swift.swiftmodule | | {{[0-9]*$}}
+// CHECK: Unit | system | {{.*}}Swift.swiftmodule
 // CHECK: DEPEND END
 
 // CHECK: s2.o-{{[A-Z0-9]*}}
 // CHECK: --------
 // CHECK: out-file: {{.*}}s2.o
 // CHECK: DEPEND START
-// CHECK: Unit | system | {{.*}}Swift.swiftmodule | | {{[0-9]*$}}
+// CHECK: Unit | system | {{.*}}Swift.swiftmodule
 // CHECK: DEPEND END

test/Index/Store/unit-one-sourcefile.swift

@@ -18,12 +18,12 @@
 // FILE1: --------
 // FILE1: out-file: {{.*}}file1.o
 // FILE1: DEPEND START
-// FILE1: Unit | system | {{.*}}Swift.swiftmodule | | {{[0-9]*$}}
+// FILE1: Unit | system | {{.*}}Swift.swiftmodule
 // FILE1: DEPEND END
 
 // FILE2: file2.o-{{[A-Z0-9]*}}
 // FILE2: --------
 // FILE2: out-file: {{.*}}file2.o
 // FILE2: DEPEND START
-// FILE2: Unit | system | {{.*}}Swift.swiftmodule | | {{[0-9]*$}}
+// FILE2: Unit | system | {{.*}}Swift.swiftmodule
 // FILE2: DEPEND END

test/Index/Store/unit-pcm-dependency.swift

@@ -51,7 +51,7 @@ func test() {
 // FILE1: DEPEND START
 // FILE1-NOT: ClangModuleA.h
 // FILE1-NOT: Unit |{{.*}}ClangModuleA
-// FILE1: Unit | system | Swift | {{.*}}Swift.swiftmodule | | {{[0-9]*$}}
+// FILE1: Unit | system | Swift | {{.*}}Swift.swiftmodule
 // FILE1-NOT: Unit |{{.*}}ClangModuleA
 // FILE1: Unit | user | ClangModuleB | {{.*}}ClangModuleB-{{[A-Z0-9]*}}.pcm | ClangModuleB-{{[A-Z0-9]*}}.pcm-
 // FILE1: Unit | user | ClangModuleC | {{.*}}ClangModuleC-{{[A-Z0-9]*}}.pcm | ClangModuleC-{{[A-Z0-9]*}}.pcm-
@@ -70,7 +70,7 @@ func test() {
 // FILE2-NOT: ClangModuleB.h
 // FILE2-NOT: Unit |{{.*}}ClangModuleB
 // FILE2-NOT: Record
-// FILE2: Unit | system | Swift | {{.*}}Swift.swiftmodule | | {{[0-9]*$}}
+// FILE2: Unit | system | Swift | {{.*}}Swift.swiftmodule
 // FILE2-NOT: Unit |{{.*}}ClangModuleB
 // FILE2-NOT: Record
 // FILE2: Unit | user | ClangModuleA | {{.*}}ClangModuleA-{{[A-Z0-9]*}}.pcm | ClangModuleA-{{[A-Z0-9]*}}.pcm-

test/Index/Store/unit-swiftmodule-dependency.swift

@@ -23,16 +23,16 @@ func test() {
 // CHECK: has-main: 1
 // CHECK: out-file: {{.*}}/SwiftModuleA.swiftmodule
 // CHECK: DEPEND START
-// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule | | {{[0-9]*$}}
+// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule
 // CHECK: DEPEND END
 
 // CHECK: [[MODB:SwiftModuleB.swiftmodule-[A-Z0-9]*]]
 // CHECK: --------
 // CHECK: has-main: 1
 // CHECK: out-file: {{.*}}/SwiftModuleB.swiftmodule
 // CHECK: DEPEND START
-// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule | | {{[0-9]*$}}
-// CHECK: Unit | user | SwiftModuleA | {{.*}}/SwiftModuleA.swiftmodule | | {{[0-9]*$}}
+// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule
+// CHECK: Unit | user | SwiftModuleA | {{.*}}/SwiftModuleA.swiftmodule
 // CHECK: DEPEND END
 
 // CHECK-NOT: main.swiftmodule-
@@ -42,16 +42,16 @@ func test() {
 // CHECK: has-main: 1
 // CHECK: out-file: {{.*}}/s1.o
 // CHECK: DEPEND START
-// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule | | {{[0-9]*$}}
-// CHECK: Unit | user | SwiftModuleA | {{.*}}/SwiftModuleA.swiftmodule | | {{[0-9]*$}}
-// CHECK: Unit | user | SwiftModuleB | {{.*}}/SwiftModuleB.swiftmodule | | {{[0-9]*$}}
+// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule
+// CHECK: Unit | user | SwiftModuleA | {{.*}}/SwiftModuleA.swiftmodule
+// CHECK: Unit | user | SwiftModuleB | {{.*}}/SwiftModuleB.swiftmodule
 // CHECK: DEPEND END
 
 // CHECK: s2.o-
 // CHECK: --------
 // CHECK: has-main: 1
 // CHECK: out-file: {{.*}}/s2.o
 // CHECK: DEPEND START
-// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule | | {{[0-9]*$}}
-// CHECK: Unit | user | SwiftModuleA | {{.*}}/SwiftModuleA.swiftmodule | | {{[0-9]*$}}
+// CHECK: Unit | system | Swift | {{.*}}/Swift.swiftmodule
+// CHECK: Unit | user | SwiftModuleA | {{.*}}/SwiftModuleA.swiftmodule
 // CHECK: DEPEND END

test/Index/Store/unit-with-bridging-header.swift

@@ -21,8 +21,8 @@
 // PCH-UNIT: has-main: 0
 // PCH-UNIT: DEPEND START
 // PCH-UNIT: Record | user | {{.*}}bridge-include.h | bridge-include.h-
-// PCH-UNIT: File | user | {{.*}}bridge-head.h |
-// PCH-UNIT: File | user | {{.*}}module.modulemap |
+// PCH-UNIT: File | user | {{.*}}bridge-head.h
+// PCH-UNIT: File | user | {{.*}}module.modulemap
 // PCH-UNIT: DEPEND END (3)
 // PCH-UNIT: INCLUDE START
 // PCH-UNIT: {{.*}}bridge-head.h:1 | {{.*}}bridge-include.h
@@ -32,7 +32,7 @@
 // PCH-UNIT: --------
 // PCH-UNIT: has-main: 1
 // PCH-UNIT: DEPEND START
-// PCH-UNIT: Unit | system | {{.*}}Swift.swiftmodule |
+// PCH-UNIT: Unit | system | {{.*}}Swift.swiftmodule
 // PCH-UNIT: Unit | user | {{.*}}bridge-head.pch | bridge-head.pch-
 // PCH-UNIT: Record | user | {{.*}}unit-with-bridging-header.swift | unit-with-bridging-header.swift-
 // PCH-UNIT: DEPEND END (3)
@@ -41,7 +41,7 @@
 // TEXTUAL-UNIT: --------
 // TEXTUAL-UNIT: has-main: 1
 // TEXTUAL-UNIT: DEPEND START
-// TEXTUAL-UNIT: Unit | system | {{.*}}Swift.swiftmodule |
+// TEXTUAL-UNIT: Unit | system | {{.*}}Swift.swiftmodule
 // TEXTUAL-UNIT: Record | user | {{.*}}unit-with-bridging-header.swift | unit-with-bridging-header.swift-
 // TEXTUAL-UNIT: DEPEND END (2)