diff options
| author | Pedro Alves <palves@redhat.com> | 2015-11-24 18:11:22 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-11-24 18:38:07 +0000 |
| commit | 62147a2265e322c758743edf13a1377fdcb62479 (patch) | |
| tree | d4334a278d93c27446b07f93319a86a235f919ba /gdb/testsuite/gdb.base/display.exp | |
| parent | 2f341b6e28e27fadd8160d95337c3aa854bcba3b (diff) | |
| download | gdb-62147a2265e322c758743edf13a1377fdcb62479.zip gdb-62147a2265e322c758743edf13a1377fdcb62479.tar.gz gdb-62147a2265e322c758743edf13a1377fdcb62479.tar.bz2 | |
List displays in ascending order
Before:
(gdb) info display
Auto-display expressions now in effect:
Num Enb Expression
3: y 1
2: y 1
1: y 1
After:
(gdb) info display
Auto-display expressions now in effect:
Num Enb Expression
1: y 1
2: y 1
3: y 1
gdb/ChangeLog:
2015-11-24 Pedro Alves <palves@redhat.com>
PR 17539
* printcmd.c (display_command): Append new display at the end of
the list.
gdb/testsuite/ChangeLog:
2015-11-24 Pedro Alves <palves@redhat.com>
PR 17539
* gdb.base/display.exp: Expect displays to be sorted in ascending
order. Use multi_line.
* gdb.base/solib-display.exp: Likewise.
Diffstat (limited to 'gdb/testsuite/gdb.base/display.exp')
| -rw-r--r-- | gdb/testsuite/gdb.base/display.exp | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp index 6e21d9e..1d02629 100644 --- a/gdb/testsuite/gdb.base/display.exp +++ b/gdb/testsuite/gdb.base/display.exp @@ -83,8 +83,23 @@ gdb_test "disp/s &sum" ".*5: x/s &sum $hex.*sum.:.*" "display/s &sum" # Hit the displays # -gdb_test "cont" ".*\[Ww\]atchpoint 3: sum.*\[1-9\]*: x/s &sum.*\[1-9\]*: /f f = 3.1415\r\n\[1-9\]*: x/i &k.*\r\n\[1-9\]*: /x j = 0x0\r\n\[1-9\]*: i = 0.*" "first disp" -gdb_test "cont" ".*\[Ww\]atchpoint 3: sum.*\[1-9\]*: x/s &sum.*\[1-9\]*: /f f = 4.1415\r\n\[1-9\]*: x/i &k.*\r\n\[1-9\]*: /x j = 0x0.*\[1-9\]*: i = 0.*" "second disp" +gdb_test "cont" [multi_line \ + ".*\[Ww\]atchpoint 3: sum.*" \ + "\[1-9\]*: i = 0.*" \ + "\[1-9\]*: /x j = 0x0" \ + "\[1-9\]*: x/i &k.*" \ + "\[1-9\]*: /f f = 3.1415" \ + "\[1-9\]*: x/s &sum.*" \ + ] "first disp" + +gdb_test "cont" [multi_line \ + ".*\[Ww\]atchpoint 3: sum.*" \ + "\[1-9\]*: i = 0.*" \ + "\[1-9\]*: /x j = 0x0.*" \ + "\[1-9\]*: x/i &k.*" \ + "\[1-9\]*: /f f = 4.1415" \ + "\[1-9\]*: x/s &sum.*" \ + ] "second disp" gdb_test "enab disp 6" ".*No display number 6..*" "catch err" gdb_test_no_output "disab disp 1" "disab disp 1" @@ -92,9 +107,19 @@ gdb_test_no_output "disab disp 2" "disab disp 2" gdb_test_no_output "enab disp 1" "re-enab" gdb_test_no_output "enab disp 1" "re-enab of enab" gdb_test_no_output "undisp 5" "undisp" -gdb_test "info disp" ".*Auto-display expressions now in effect.*y /f f.*y /1bi &k.*n /x j.*y i.*" "info disp" - -gdb_test "cont" ".*\[Ww\]atch.*5.1415.*.*i = 0.*" "next hit" +gdb_test "info disp" [multi_line \ + "Auto-display expressions now in effect.*" \ + ".*y i" \ + ".*n /x j" \ + ".*y /1bi &k" \ + ".*y /f f" \ + ] "info disp" + +gdb_test "cont" [multi_line \ + ".*\[Ww\]atch.*" \ + ".*i = 0" \ + ".*5.1415" \ + ] "next hit" gdb_test "undisp" \ "" \ |