Skip to content

Commit 229d69b

Browse files
committed
[lldb] Fix flakyness in command-disassemble-process.yaml
(cherry picked from commit 557a0e7)
1 parent 9c826de commit 229d69b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

lldb/test/Shell/Commands/Inputs/command-disassemble-process.lldbinit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ disassemble --line
33
disassemble --frame
44
disassemble --pc
55
disassemble --address 0x4004
6-
disassemble --address 0xdead
76
disassemble --count 7
87
disassemble --pc --count 7

lldb/test/Shell/Commands/command-disassemble-process.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
# RUN: -o "settings set stop-disassembly-max-size 8000" \
1414
# RUN: -o disassemble -o exit 2>&1 | FileCheck %s --check-prefix=BIG
1515

16+
# RUN: %lldb -c %t %T/command-disassemble-process.exe \
17+
# RUN: -o "settings set interpreter.stop-command-source-on-error false" \
18+
# RUN: -o "disassemble --address 0xdead" -o exit 2>&1 \
19+
# RUN: | FileCheck %s --check-prefix=INVALID
20+
1621
# CHECK: (lldb) disassemble
1722
# CHECK-NEXT: command-disassemble-process.exe`main:
1823
# CHECK-NEXT: 0x4002 <+0>: addb %al, (%rcx)
@@ -43,8 +48,6 @@
4348
# CHECK-NEXT: -> 0x4004 <+2>: addb %al, (%rdx)
4449
# CHECK-NEXT: 0x4006 <+4>: addb %al, (%rbx)
4550
# CHECK-NEXT: 0x4008 <+6>: addb %al, (%rsi)
46-
# CHECK-NEXT: (lldb) disassemble --address 0xdead
47-
# CHECK-NEXT: error: Could not find function bounds for address 0xdead
4851
# CHECK-NEXT: (lldb) disassemble --count 7
4952
# CHECK-NEXT: command-disassemble-process.exe`main:
5053
# CHECK-NEXT: 0x4002 <+0>: addb %al, (%rcx)
@@ -64,6 +67,9 @@
6467
# CHECK-NEXT: 0x400e: addb %cl, (%rcx)
6568
# CHECK-NEXT: 0x4010: addb %cl, (%rdx)
6669

70+
# INVALID: (lldb) disassemble --address 0xdead
71+
# INVALID: error: Could not find function bounds for address 0xdead
72+
6773
# BIG: error: Not disassembling the current function because it is very large [0x0000000000004002-0x0000000000005f42). To disassemble specify an instruction count limit, start/stop addresses or use the --force option.
6874

6975
--- !ELF

0 commit comments

Comments
 (0)