X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.base%2Fdisplay.exp;h=8cf0af0d7c336e32c421c7bcfedd4fd6e35ef499;hb=e2882c85786571175a0b0bfc3bcd2f14620b1ea3;hp=cc99cd4101bcb8f59238ea18942b27a922abb342;hpb=01f0fe5e0450edf168c1f612feb93cf588e4e7ea;p=thirdparty%2Fbinutils-gdb.git
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index cc99cd4101b..8cf0af0d7c3 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -1,41 +1,26 @@
-# Copyright 1997, 1998, 1999, 2000, 2001, 2003
-# Free Software Foundation, Inc.
+# Copyright 1997-2018 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
+# along with this program. If not, see .
# display.exp Test display commands
# Also do some printing stuff for coverage's sake.
#
-if $tracelevel then {
- strace $tracelevel
-}
-
-set testfile display
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
-
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
- gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-if [target_info exists gdb_stub] {
- gdb_step_for_stub;
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug nowarnings}]} {
+ return -1
}
# Preserve the old timeout, and set a new one that should be
@@ -47,14 +32,9 @@ verbose "Timeout is now $timeout seconds" 2
# use this to debug:
#log_user 1
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
# Some coverage stuff
#
-if ![target_info exists use_gdb_stub] {
+if !$use_gdb_stub {
gdb_test "kill" ".*The program is not being run.*"
gdb_test "detach" ".*"
gdb_test "run" ".*"
@@ -72,68 +52,98 @@ if ![target_info exists use_gdb_stub] {
# Ok, on to real life
#
if ![runto_main] then {
- fail "Could not run to main - other tests will fail."
+ fail "could not run to main - other tests will fail."
continue
}
# Disable hardware watchpoints if necessary.
if [target_info exists gdb,no_hardware_watchpoints] {
- gdb_test "set can-use-hw-watchpoints 0" "" ""
+ gdb_test_no_output "set can-use-hw-watchpoints 0" ""
}
-gdb_test "break 14" ".*Breakpoint 2.*" "break do_loops"
+set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
+gdb_test "break $bp_location1" ".*Breakpoint 2.*" "break do_loops"
gdb_test "cont" ".*Breakpoint 2, do_loops.*" "get to do_loops"
# Create stopping points.
#
gdb_test "watch sum" ".*\[Ww\]atchpoint 3: sum.*" "set watch"
-gdb_test "break 19" ".*Breakpoint 4.*" "break 19"
+set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
+gdb_test "break $bp_location2" ".*Breakpoint 4.*" "break loop end"
# Create displays for those points
#
gdb_test "info disp" ".*There are no auto-display expressions now..*" "inf disp"
gdb_test "disp i" ".*1: i = 0.*" "display i"
gdb_test "disp/x j" ".*2: /x j = 0x0.*" "display j"
-gdb_test "disp/i &k" ".*3: x/i &k $hex:.*" "display &k"
+gdb_test "disp/i &k" ".*3: x/i &k(\r\n| ) $hex:.*" "display &k"
gdb_test "disp/f f" ".*4: /f f = 3.1415*" "display/f f"
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 "disab disp 1" ".*" "disab disp 1"
-gdb_test "disab disp 2" ".*" "disab disp 2"
-gdb_test "enab disp 1" ".*" "re-enab"
-gdb_test "enab disp 1" ".*" "re-enab of enab"
-gdb_test "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"
-
-send_gdb "undisp\n"
-gdb_expect {
- -re ".*Delete all auto-display expressions.*y or n. $" {
- send_gdb "y\n"
- gdb_expect {
- -re "y\r\n$gdb_prompt $" {
- pass "undisp all"
- }
- -re ".*$gdb_prompt $" {
- fail "some un-helpful response"
- }
- -re ".*Delete all.*$" {
- fail "re-ask question"
- }
- timeout { fail "timeout" }
- }
- }
- -re ".*$gdb_prompt $" {
- fail "undisp all"
- }
- timeout { fail "timeout" }
+gdb_test_no_output "disab disp 1" "disab disp 1"
+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" [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" \
+ "" \
+ "undisp all" \
+ ".*Delete all auto-display expressions.*y or n. $" \
+ "y"
+
+
+# Test displaying a variable that is temporarily at a bad address.
+# But if we can examine what's at memory address 0, then we'll also be
+# able to display it without error. Don't run the test in that case.
+set can_read_0 [is_address_zero_readable]
+
+if { !$can_read_0 } {
+ gdb_test "disp *p_i" ".*: \\*p_i = 0"
+ gdb_test "p p_i = 0x0" " = \\(int \\*\\) 0x0"
+ gdb_test "display" ".*: \\*p_i = " "display bad address"
+ gdb_test "p p_i = &i" " = \\(int \\*\\) $hex"
+ gdb_test "display" ".*: \\*p_i = 0" "display good address"
+
+ gdb_test "undisp" \
+ "" \
+ "undisp all again" \
+ ".*Delete all auto-display expressions.*y or n. $" \
+ "y"
}
gdb_test "disab 3" ".*.*" "disab 3"
@@ -145,8 +155,7 @@ gdb_test "cont" ".*Breakpoint 4.*" "watch off"
# targets, including but not limited to the m68k, i386 & PA. So we
# have to arrange to step until we hit the line with the call to
# "do_vars".
-send_gdb "finish\n"
-gdb_expect {
+gdb_test_multiple "finish" "finish" {
-re ".*do_loops\\(\\);.*$gdb_prompt $" {
send_gdb "step\n"
exp_continue
@@ -154,19 +163,12 @@ gdb_expect {
-re ".*do_vars.*$gdb_prompt $" {
pass "finish"
}
- -re ".*$gdb_prompt $" {
- fail "finish"
- gdb_suppress_tests
- }
- timeout {
- fail "(timeout) finish"
- gdb_suppress_tests
- }
}
-gdb_test "step" ".*do_vars.*.*27.*"
-gdb_test "tbreak 37" ".*Breakpoint 5 a.*"
-gdb_test "cont" ".*do_vars.*37.*37.*"
+gdb_test "step" ".*do_vars.*.*i = 9.*"
+set bp_location3 [gdb_get_line_number "set breakpoint 3 here"]
+gdb_test "tbreak $bp_location3" ".*breakpoint 5 a.*" "tbreak in do_vars"
+gdb_test "cont" ".*do_vars.*$bp_location3.*$bp_location3.*"
# Beat on printf a bit
#
@@ -175,27 +177,26 @@ gdb_test "printf %d" ".*Bad format string, missing.*"
gdb_test "printf \"%d" ".*Bad format string, non-terminated.*"
gdb_test "printf \"%d%d\",i" ".*Wrong number of arguments.*"
gdb_test "printf \"\\\\!\\a\\f\\r\\t\\v\\b\\n\"" ".*!.*"
-gdb_test "printf \"\"" ".*" "re-set term"
+gdb_test_no_output "printf \"\"" "re-set term"
gdb_test "printf \"\\w\"" ".*Unrecognized escape character.*"
gdb_test "printf \"%d\" j" ".*Invalid argument syntax.*"
+gdb_test "printf \"%p\\n\", 0" "\\(nil\\)"
+gdb_test "printf \"%p\\n\", 1" "0x1"
# play with "print", too
#
-gdb_test "print/r j" ".*Undefined output format.*"
-gdb_test "print j" ".*" "debug test output"
+gdb_test "print/k j" ".*Undefined output format.*"
+gdb_test "print/d j" " = 0\[\\r\\n\]+" "debug test output 1"
+gdb_test "print/r j" " = 0\[\\r\\n\]+" "debug test output 1a"
+gdb_test "print/x j" " = 0x0\[\\r\\n\]+" "debug test output 2"
+gdb_test "print/r j" " = 0x0\[\\r\\n\]+" "debug test output 2a"
+gdb_test "print j" " = 0\[\\r\\n\]+" "debug test output 3"
# x/0 j doesn't produce any output and terminates PA64 process when testing
-if [istarget "hppa2.0w-hp-hpux11*"] {
- xfail "'x/0 j' terminates PA64 process - skipped test point"
-} else {
- gdb_test "x/0 j" ".*"
-}
-if [istarget "hppa*-hp-hpux*"] {
- # on HP-UX you could access the first page without getting an error
- gdb_test "x/rx j" ".*(Cannot access|Error accessing) memory.*|.*0xa:\[ \t\]*\[0-9\]+.*"
-}
+gdb_test_no_output "x/0 j"
+
gdb_test "print/0 j" ".*Item count other than 1 is meaningless.*" "print/0 j"
-gdb_test "print/s sum" ".*Format letter.*is meaningless.*" " no s"
+gdb_test "print/s sum" " = 1000" "ignored s"
gdb_test "print/i sum" ".*Format letter.*is meaningless.*.*" "no i"
gdb_test "print/a &sum" ".*= $hex.*.*"
# If the constant below is larger than the length of main, then