Merge pull request #69020 from al45tair/eng/PR-116584708-5.10

artemcm · web-flow · commit b691b8d6c8b2 · 2023-10-06T10:21:42.000-07:00
[Test][Backtracing] Make FatalError test more lenient.
diff --git a/test/Backtracing/FatalError.swift b/test/Backtracing/FatalError.swift
@@ -37,7 +37,7 @@ struct FatalError {
   }
 }
 
-// CHECK: *** Program crashed: Illegal instruction at 0x{{[0-9a-f]+}} ***
+// CHECK: *** Program crashed: {{Illegal instruction|System trap}} at 0x{{[0-9a-f]+}} ***
 
 // CHECK: Thread 0 {{(".*" )?}}crashed:
 
@@ -50,4 +50,3 @@ struct FatalError {
 // CHECK-NEXT: 6 [ra]          0x{{[0-9a-f]+}} static FatalError.main() + {{[0-9]+}} in FatalError at {{.*}}/FatalError.swift:36:5
 // CHECK-NEXT: 7 [ra] [system] 0x{{[0-9a-f]+}} static FatalError.$main() + {{[0-9]+}} in FatalError at {{.*}}/<compiler-generated>
 // CHECK-NEXT: 8 [ra] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in FatalError at {{.*}}/FatalError.swift
-

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ struct FatalError {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-// CHECK: * Program crashed: Illegal instruction at 0x{{[0-9a-f]+}} *`
	`40`	`+// CHECK: * Program crashed: {{Illegal instruction\|System trap}} at 0x{{[0-9a-f]+}} *`
`41`	`41`
`42`	`42`	`// CHECK: Thread 0 {{(".*" )?}}crashed:`
`43`	`43`
`@@ -50,4 +50,3 @@ struct FatalError {`
`50`	`50`	`// CHECK-NEXT: 6 [ra] 0x{{[0-9a-f]+}} static FatalError.main() + {{[0-9]+}} in FatalError at {{.*}}/FatalError.swift:36:5`
`51`	`51`	`// CHECK-NEXT: 7 [ra] [system] 0x{{[0-9a-f]+}} static FatalError.$main() + {{[0-9]+}} in FatalError at {{.*}}/<compiler-generated>`
`52`	`52`	`// CHECK-NEXT: 8 [ra] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in FatalError at {{.*}}/FatalError.swift`
`53`		`-`