Fix tests

hlopko · hlopko · commit 0fac503d9207 · 2020-09-29T11:34:02.000+02:00
diff --git a/test/Interop/Cxx/templates/class-template-instantiation-demangling.swift b/test/Interop/Cxx/templates/class-template-instantiation-demangling.swift
@@ -8,5 +8,5 @@ public func returnInstantiation() -> WrappedMagicInt {
   return WrappedMagicInt()
 }
 
-// CHECK: $s10demangling20receiveInstantiationyySo34__CxxTemplateInst12MagicWrapperIiEVzF ---> demangling.receiveInstantiation(inout __C.__CxxTemplateInst12MagicWrapperIiE) -> ()
-// CHECK: $s10demangling19returnInstantiationSo34__CxxTemplateInst12MagicWrapperIiEVyF ---> demangling.returnInstantiation() -> __C.__CxxTemplateInst12MagicWrapperIiE
+// CHECK: $s4main20receiveInstantiationyySo34__CxxTemplateInst12MagicWrapperIiEVzF ---> main.receiveInstantiation(inout __C.__CxxTemplateInst12MagicWrapperIiE) -> ()
+// CHECK: $s4main19returnInstantiationSo34__CxxTemplateInst12MagicWrapperIiEVyF ---> main.returnInstantiation() -> __C.__CxxTemplateInst12MagicWrapperIiE
diff --git a/test/Interop/Cxx/templates/class-template-instantiation-error-handling.swift b/test/Interop/Cxx/templates/class-template-instantiation-error-handling.swift
@@ -5,7 +5,7 @@ import StdlibUnittest
 
 var TemplatesTestSuite = TestSuite("TemplatesTestSuite")
 
-// CHECK: class-instantiation-error-handling.swift:10:18: error: only C++ types supported
+// CHECK: class-template-instantiation-error-handling.swift:10:18: error: only C++ types supported
 TemplatesTestSuite.test("swift-template-arg-not-supported") {
   var magicInt = MagicWrapper<String>(t: "asdf")
 }

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ public func returnInstantiation() -> WrappedMagicInt {`
`8`	`8`	`return WrappedMagicInt()`
`9`	`9`	`}`
`10`	`10`
`11`		`-// CHECK: $s10demangling20receiveInstantiationyySo34__CxxTemplateInst12MagicWrapperIiEVzF ---> demangling.receiveInstantiation(inout __C.__CxxTemplateInst12MagicWrapperIiE) -> ()`
`12`		`-// CHECK: $s10demangling19returnInstantiationSo34__CxxTemplateInst12MagicWrapperIiEVyF ---> demangling.returnInstantiation() -> __C.__CxxTemplateInst12MagicWrapperIiE`
	`11`	`+// CHECK: $s4main20receiveInstantiationyySo34__CxxTemplateInst12MagicWrapperIiEVzF ---> main.receiveInstantiation(inout __C.__CxxTemplateInst12MagicWrapperIiE) -> ()`
	`12`	`+// CHECK: $s4main19returnInstantiationSo34__CxxTemplateInst12MagicWrapperIiEVyF ---> main.returnInstantiation() -> __C.__CxxTemplateInst12MagicWrapperIiE`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import StdlibUnittest`
`5`	`5`
`6`	`6`	`var TemplatesTestSuite = TestSuite("TemplatesTestSuite")`
`7`	`7`
`8`		`-// CHECK: class-instantiation-error-handling.swift:10:18: error: only C++ types supported`
	`8`	`+// CHECK: class-template-instantiation-error-handling.swift:10:18: error: only C++ types supported`
`9`	`9`	`TemplatesTestSuite.test("swift-template-arg-not-supported") {`
`10`	`10`	`var magicInt = MagicWrapper<String>(t: "asdf")`
`11`	`11`	`}`