Skip to content

Commit eac93f9

Browse files
committed
[Backtracing][Tests] Apparently we don't see the dyld frame in CI.
For some reason we don't see the dyld frames in CI. That's fine, don't check for them. Also turn NotImportedByDefault off for Windows as it needs a better shell than the support provided there.
1 parent 9c3ea84 commit eac93f9

File tree

5 files changed

+4
-9
lines changed

5 files changed

+4
-9
lines changed

test/Backtracing/Crash.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ struct Crash {
5757
// CHECK-NEXT: 5 [ra] 0x{{[0-9a-f]+}} static Crash.main() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:44:5
5858
// CHECK-NEXT: 6 [ra] [system] 0x{{[0-9a-f]+}} static Crash.$main() + {{[0-9]+}} in Crash at {{.*}}/Crash.swift:41:1
5959
// CHECK-NEXT: 7 [ra] [system] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in Crash at {{.*}}/Crash.swift
60-
// CHECK-NEXT: 8 [ra] [system] 0x{{[0-9a-f]+}} start + {{[0-9]+}} in dyld
6160

6261
// CHECK: Registers:
6362

@@ -135,7 +134,6 @@ struct Crash {
135134
// NODEBUG: 5 [ra] 0x{{[0-9a-f]+}} static Crash.main() + {{[0-9]+}} in CrashNoDebug
136135
// NODEBUG: 6 [ra] [system] 0x{{[0-9a-f]+}} static Crash.$main() + {{[0-9]+}} in CrashNoDebug
137136
// NODEBUG: 7 [ra] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in CrashNoDebug
138-
// NODEBUG: 8 [ra] [system] 0x{{[0-9a-f]+}} start + {{[0-9]+}} in dyld
139137

140138
// NODEBUG: Registers:
141139

@@ -155,7 +153,6 @@ struct Crash {
155153
// OPTIMIZED-NEXT: 5 [inlined] 0x{{[0-9a-f]+}} static Crash.main() in CrashOpt at {{.*}}/Crash.swift:44:5
156154
// OPTIMIZED-NEXT: 6 [inlined] [system] 0x{{[0-9a-f]+}} static Crash.$main() in CrashOpt at {{.*}}/Crash.swift:41:1
157155
// OPTIMIZED-NEXT: 7 [system] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in CrashOpt at {{.*}}/Crash.swift
158-
// OPTIMIZED-NEXT: 8 [ra] [system] 0x{{[0-9a-f]+}} start + {{[0-9]+}} in dyld
159156

160157
// OPTIMIZED: Registers:
161158

@@ -168,7 +165,6 @@ struct Crash {
168165
// OPTNODEBUG: Thread 0 crashed:
169166

170167
// OPTNODEBUG: 0 0x{{[0-9a-f]+}} main + {{[0-9]+}} in CrashOptNoDebug
171-
// OPTNODEBUG-NEXT: 1 [ra] [system] 0x{{[0-9a-f]+}} start + {{[0-9]+}} in dyld
172168

173169
// OPTNODEBUG: Registers:
174170

test/Backtracing/CrashWithThunk.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ struct CrashWithThunk {
3535
// CHECK-NEXT: 2 [ra] 0x{{[0-9a-f]+}} static CrashWithThunk.main() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:25:9
3636
// CHECK-NEXT: 3 [ra] [system] 0x{{[0-9a-f]+}} static CrashWithThunk.$main() + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift:20:1
3737
// CHECK-NEXT: 4 [ra] [system] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in CrashWithThunk at {{.*}}/CrashWithThunk.swift
38-
// CHECK-NEXT: 5 [ra] [system] 0x{{[0-9a-f]+}} start + {{[0-9]+}} in dyld
3938

4039
// CHECK: Registers:
4140

test/Backtracing/NotImportedByDefault.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: ( %target-build-swift %s -o %t/NotImportedByDefault || true) 2>&1 | %FileCheck %s
2+
// RUN: ( %target-build-swift %s -o %t/NotImportedByDefault || true ) 2>&1 | %FileCheck %s
3+
4+
// Windows chokes on the parens in the above expression
5+
// UNSUPPORTED: OS=windows-msvc
36

47
let backtrace = try! Backtrace.capture()
58

test/Backtracing/Overflow.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ struct Overflow {
5050
// CHECK-NEXT: 6 [ra] 0x{{[0-9a-f]+}} static Overflow.main() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:36:5
5151
// CHECK-NEXT: 7 [ra] [system] 0x{{[0-9a-f]+}} static Overflow.$main() + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift:33:1
5252
// CHECK-NEXT: 8 [ra] [system] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in Overflow at {{.*}}/Overflow.swift
53-
// CHECK-NEXT: 9 [ra] [system] 0x{{[0-9a-f]+}} start + {{[0-9]+}} in dyld
5453

5554
// CHECK: Registers:
5655

test/Backtracing/StackOverflow.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ struct StackOverflow {
9393
// CHECK-NEXT: {{[0-9]+}} [ra] 0x{{[0-9a-f]+}} static StackOverflow.main() + {{[0-9]+}} in StackOverflow at {{.*}}/StackOverflow.swift:{{21|20}}:5
9494
// CHECK-NEXT: {{[0-9]+}} [ra] [system] 0x{{[0-9a-f]+}} static StackOverflow.$main() + {{[0-9]+}} in StackOverflow at {{.*}}/StackOverflow.swift:{{18|17}}:1
9595
// CHECK-NEXT: {{[0-9]+}} [ra] [system] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in StackOverflow at {{.*}}/StackOverflow.swift
96-
// CHECK-NEXT: {{[0-9]+}} [ra] [system] 0x{{[0-9a-f]+}} start + {{[0-9]+}} in dyld
9796

9897
// CHECK: Registers:
9998

@@ -120,7 +119,6 @@ struct StackOverflow {
120119
// LIMITED-NEXT: {{[0-9]+}} [ra] 0x{{[0-9a-f]+}} static StackOverflow.main() + {{[0-9]+}} in StackOverflow at {{.*}}/StackOverflow.swift:{{21|20}}:5
121120
// LIMITED-NEXT: {{[0-9]+}} [ra] [system] 0x{{[0-9a-f]+}} static StackOverflow.$main() + {{[0-9]+}} in StackOverflow at {{.*}}/StackOverflow.swift:{{18|17}}:1
122121
// LIMITED-NEXT: {{[0-9]+}} [ra] [system] 0x{{[0-9a-f]+}} main + {{[0-9]+}} in StackOverflow at {{.*}}/StackOverflow.swift
123-
// LIMITED-NEXT: {{[0-9]+}} [ra] [system] 0x{{[0-9a-f]+}} start + {{[0-9]+}} in dyld
124122

125123
// FRIENDLY: *** Program crashed: Bad pointer dereference at 0x{{[0-9a-f]+}} ***
126124

0 commit comments

Comments
 (0)