From: Michael Snyder Date: Tue, 25 May 2010 19:34:05 +0000 (+0000) Subject: 2010-05-25 Michael Snyder X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=65731a6b77c790f8d97b65eb967efaf2db0f27b5;p=binutils-gdb.git 2010-05-25 Michael Snyder * gdb.base/maint.exp: Replace send_gdb with gdb_test. * gdb.base/miscexprs.exp: Replace send_gdb with gdb_test. * gdb.base/nodebug.exp: Replace send_gdb with gdb_test. * gdb.base/pointers.exp: Replace send_gdb with gdb_test. * gdb.base/ptype.exp: Replace send_gdb with gdb_test. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6526f1a640f..d42310a3db3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,9 +1,4 @@ -2010-05-25 Doug Evans - - * gdb.python/py-cmd.exp: Add tests for gdb.GdbError and - gdb.string_to_argv. - -2010-05-24 Michael Snyder +2010-05-25 Michael Snyder * gdb.base/call-ar-st.exp: Replace send_gdb with gdb_test. * gdb.base/callfuncs.exp: Replace send_gdb with gdb_test. @@ -38,6 +33,16 @@ * gdb.base/info-proc.exp: Replace send_gdb with gdb_test. * gdb.base/jump.exp: Replace send_gdb with gdb_test. * gdb.base/long_long.exp: Replace send_gdb with gdb_test. + * gdb.base/maint.exp: Replace send_gdb with gdb_test. + * gdb.base/miscexprs.exp: Replace send_gdb with gdb_test. + * gdb.base/nodebug.exp: Replace send_gdb with gdb_test. + * gdb.base/pointers.exp: Replace send_gdb with gdb_test. + * gdb.base/ptype.exp: Replace send_gdb with gdb_test. + +2010-05-25 Doug Evans + + * gdb.python/py-cmd.exp: Add tests for gdb.GdbError and + gdb.string_to_argv. 2010-05-21 Tom Tromey diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index 11f4ba49113..ac96a99c1c2 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/gdb/testsuite/gdb.base/maint.exp @@ -91,8 +91,7 @@ if ![runto_main] then { # The commands we test here produce many lines of output; disable "press # to continue" prompts. -send_gdb "set height 0\n" -gdb_expect -re "$gdb_prompt $" +gdb_test_no_output "set height 0" # @@ -106,82 +105,41 @@ gdb_expect -re "$gdb_prompt $" # send_gdb "maint check-symtabs\n" gdb_expect { - -re "^maint check-symtabs" { - gdb_expect { - -re "$gdb_prompt $" \ - { pass "maint check-symtabs" } - timeout { fail "(timeout) maint check-symtabs" } + -re "^maint check-symtabs" { + gdb_expect { + -re "$gdb_prompt $" { + pass "maint check-symtabs" } + timeout { fail "(timeout) maint check-symtabs" } } - -re ".*$gdb_prompt $" { fail "maint check-symtabs" } - timeout { fail "(timeout) maint check-symtabs" } - } + } + -re ".*$gdb_prompt $" { fail "maint check-symtabs" } + timeout { fail "(timeout) maint check-symtabs" } +} -send_gdb "maint space\n" -gdb_expect { - -re "\"maintenance space\" takes a numeric argument\\..*$gdb_prompt $"\ - { pass "maint space" } - -re ".*$gdb_prompt $" { fail "maint space" } - timeout { fail "(timeout) maint space" } - } +gdb_test "maint space" \ + "\"maintenance space\" takes a numeric argument\\." -send_gdb "maint space 1\n" -gdb_expect { - -re "Space used: $decimal \\(\\+$decimal for this command\\).*$gdb_prompt $"\ - { pass "maint space 1" } - -re ".*$gdb_prompt $" { fail "maint space 1" } - timeout { fail "(timeout) maint space 1" } - } +gdb_test "maint space 1" \ + "Space used: $decimal \\(\\+$decimal for this command\\)" +gdb_test "maint time" \ + "\"maintenance time\" takes a numeric argument\\..*Space used: $decimal \\(\\+$decimal for this command\\)" -send_gdb "maint time\n" -gdb_expect { - -re "\"maintenance time\" takes a numeric argument\\..*Space used: $decimal \\(\\+$decimal for this command\\).*$gdb_prompt $"\ - { pass "maint time" } - -re ".*$gdb_prompt $" { fail "maint time" } - timeout { fail "(timeout) maint time" } - } +gdb_test "maint time 1" \ + "Command execution time: $decimal.*Space used: $decimal \\(\\+$decimal for this command\\)" -send_gdb "maint time 1\n" -gdb_expect { - -re "Command execution time: $decimal.*Space used: $decimal \\(\\+$decimal for this command\\).*$gdb_prompt $"\ - { pass "maint time 1" } - -re ".*$gdb_prompt $" { fail "maint time 1" } - timeout { fail "(timeout) maint time 1" } - } +gdb_test "maint time 0" \ + "Space used: $decimal \\(\\+$decimal for this command\\)" -send_gdb "maint time 0\n" -gdb_expect { - -re "Space used: $decimal \\(\\+$decimal for this command\\).*$gdb_prompt $"\ - { pass "maint time 0" } - -re ".*$gdb_prompt $" { fail "maint time 0" } - timeout { fail "(timeout) maint time 0" } - } +gdb_test_no_output "maint space 0" +gdb_test "maint demangle" \ + "\"maintenance demangle\" takes an argument to demangle\\." -send_gdb "maint space 0\n" -gdb_expect { - -re "maint space 0\r\n$gdb_prompt $"\ - { pass "maint space 0" } - -re ".*$gdb_prompt $" { fail "maint space 0" } - timeout { fail "(timeout) maint space 0" } - } +gdb_test "maint demangle main" "Can't demangle \"main\"" -send_gdb "maint demangle\n" -gdb_expect { - -re "\"maintenance demangle\" takes an argument to demangle\\..*$gdb_prompt $"\ - { pass "maint demangle" } - -re ".*$gdb_prompt $" { fail "maint demangle" } - timeout { fail "(timeout) maint demangle" } - } -send_gdb "maint demangle main\n" -gdb_expect { - -re "Can't demangle \"main\".*$gdb_prompt $"\ - { pass "maint demangle" } - -re ".*$gdb_prompt $" { fail "maint demangle" } - timeout { fail "(timeout) maint demangle" } - } # The timeout value is raised, because printing all the symbols and # statistical information about Cygwin and Windows libraries takes a lot @@ -191,18 +149,15 @@ if [istarget "*-*-cygwin*"] { set timeout [expr $timeout + 500] } -send_gdb "maint print statistics\n" -gdb_expect { - -re "Statistics for.*break.*Number of \"minimal\" symbols read.*Number of \"partial\" symbols read.*Number of \"types\" defined.*Number of psym tables \\(not yet expanded\\).*Number of symbol tables.*Number of symbol tables with line tables.*Number of symbol tables with blockvectors.*Total memory used for psymbol obstack.*Total memory used for psymbol cache.*Total memory used for symbol obstack.*Total memory used for type obstack.*$gdb_prompt $"\ - { - # Old output for gdb 6.0 and earlier - pass "maint print statistics" - } - -re "Statistics for.*break.*Number of \"minimal\" symbols read.*Number of \"partial\" symbols read.*Number of \"types\" defined.*Number of psym tables \\(not yet expanded\\).*Number of symbol tables.*Number of symbol tables with line tables.*Number of symbol tables with blockvectors.*Total memory used for objfile obstack.*Total memory used for psymbol cache.*Total memory used for macro cache.*$gdb_prompt $"\ - { pass "maint print statistics" } - -re ".*$gdb_prompt $" { fail "maint print statistics" } - timeout { fail "(timeout) maint print statistics" } - } +gdb_test_multiple "maint print statistics" "maint print statistics" { + -re "Statistics for.*break.*Number of \"minimal\" symbols read.*Number of \"partial\" symbols read.*Number of \"types\" defined.*Number of psym tables \\(not yet expanded\\).*Number of symbol tables.*Number of symbol tables with line tables.*Number of symbol tables with blockvectors.*Total memory used for psymbol obstack.*Total memory used for psymbol cache.*Total memory used for symbol obstack.*Total memory used for type obstack.*$gdb_prompt $" { + # Old output for gdb 6.0 and earlier + pass "maint print statistics" + } + -re "Statistics for.*break.*Number of \"minimal\" symbols read.*Number of \"partial\" symbols read.*Number of \"types\" defined.*Number of psym tables \\(not yet expanded\\).*Number of symbol tables.*Number of symbol tables with line tables.*Number of symbol tables with blockvectors.*Total memory used for objfile obstack.*Total memory used for psymbol cache.*Total memory used for macro cache.*$gdb_prompt $" { + pass "maint print statistics" + } +} # There aren't any ... gdb_test "maint print dummy-frames" "" @@ -243,85 +198,79 @@ maint_pass_if $header "maint print objfiles: header" maint_pass_if $psymtabs "maint print objfiles: psymtabs" maint_pass_if $symtabs "maint print objfiles: symtabs" -send_gdb "maint print psymbols\n" -gdb_expect { - -re "print-psymbols takes an output file name and optional symbol file name.*$gdb_prompt $"\ - { pass "maint print psymbols w/o args" } - -re ".*$gdb_prompt $" { fail "maint print psymbols w/o args" } - timeout { fail "(timeout) maint print psymbols w/o args" } - } +gdb_test "maint print psymbols" \ + "print-psymbols takes an output file name and optional symbol file name" \ + "maint print psymbols w/o args" + + send_gdb "maint print psymbols psymbols_output ${srcdir}/${subdir}/${srcfile}\n" gdb_expect { - -re "^maint print psymbols psymbols_output \[^\n\]*\r\n$gdb_prompt $"\ - { - send_gdb "shell ls psymbols_output\n" - gdb_expect { - -re "psymbols_output\r\n$gdb_prompt $"\ - { - # We want this grep to be as specific as possible, - # so it's less likely to match symbol file names in - # psymbols_output. Yes, this actually happened; - # poor expect got tons of output, and timed out - # trying to match it. --- Jim Blandy - send_gdb "shell grep 'main.*function' psymbols_output\n" - gdb_expect { - -re ".main., function, $hex.*$gdb_prompt $"\ - { pass "maint print psymbols 1" } - -re ".*main. .., function, $hex.*$gdb_prompt $"\ - { pass "maint print psymbols 2" } - -re ".*$gdb_prompt $" { fail "maint print psymbols" } - timeout { fail "(timeout) maint print psymbols" } - } - gdb_test "shell rm -f psymbols_output" "" - - } - -re ".*$gdb_prompt $" { fail "maint print psymbols" } - timeout { fail "(timeout) maint print psymbols" } - } - } - -re ".*$gdb_prompt $" { fail "maint print psymbols" } - timeout { fail "(timeout) maint print psymbols" } - } + -re "^maint print psymbols psymbols_output \[^\n\]*\r\n$gdb_prompt $" { + send_gdb "shell ls psymbols_output\n" + gdb_expect { + -re "psymbols_output\r\n$gdb_prompt $" { + # We want this grep to be as specific as possible, + # so it's less likely to match symbol file names in + # psymbols_output. Yes, this actually happened; + # poor expect got tons of output, and timed out + # trying to match it. --- Jim Blandy + send_gdb "shell grep 'main.*function' psymbols_output\n" + gdb_expect { + -re ".main., function, $hex.*$gdb_prompt $" { + pass "maint print psymbols 1" + } + -re ".*main. .., function, $hex.*$gdb_prompt $" { + pass "maint print psymbols 2" + } + -re ".*$gdb_prompt $" { fail "maint print psymbols" } + timeout { fail "(timeout) maint print psymbols" } + } + gdb_test "shell rm -f psymbols_output" "" + } + -re ".*$gdb_prompt $" { fail "maint print psymbols" } + timeout { fail "(timeout) maint print psymbols" } + } + } + -re ".*$gdb_prompt $" { fail "maint print psymbols" } + timeout { fail "(timeout) maint print psymbols" } +} +gdb_test "maint print msymbols" \ + "print-msymbols takes an output file name and optional symbol file name" \ + "maint print msymbols w/o args" -send_gdb "maint print msymbols\n" -gdb_expect { - -re "print-msymbols takes an output file name and optional symbol file name.*$gdb_prompt $"\ - { pass "maint print msymbols w/o args" } - -re ".*$gdb_prompt $" { fail "maint print msymbols w/o args" } - timeout { fail "(timeout) maint print msymbols w/o args" } - } send_gdb "maint print msymbols msymbols_output ${binfile}\n" gdb_expect { - -re "^maint print msymbols msymbols_output \[^\n\]*\r\n$gdb_prompt $"\ - { - send_gdb "shell ls msymbols_output\n" - gdb_expect { - -re "msymbols_output\r\n$gdb_prompt $"\ - { - send_gdb "shell grep factorial msymbols_output\n" - gdb_expect { - -re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex factorial.*$gdb_prompt $"\ - { pass "maint print msymbols" } - -re ".*$gdb_prompt $" { fail "maint print msymbols" } - timeout { fail "(timeout) maint print msymbols" } - } - gdb_test "shell rm -f msymbols_output" "" - - } - -re ".*$gdb_prompt $" { fail "maint print msymbols" } - timeout { fail "(timeout) maint print msymbols" } - } - } - -re ".*$gdb_prompt $" { fail "maint print msymbols" } - timeout { fail "(timeout) maint print msymbols" } - } + -re "^maint print msymbols msymbols_output \[^\n\]*\r\n$gdb_prompt $" { + send_gdb "shell ls msymbols_output\n" + gdb_expect { + -re "msymbols_output\r\n$gdb_prompt $" { + send_gdb "shell grep factorial msymbols_output\n" + gdb_expect { + -re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex factorial.*$gdb_prompt $" { + pass "maint print msymbols" + } + -re ".*$gdb_prompt $" { fail "maint print msymbols" } + timeout { fail "(timeout) maint print msymbols" } + } + gdb_test "shell rm -f msymbols_output" "" + } + -re ".*$gdb_prompt $" { fail "maint print msymbols" } + timeout { fail "(timeout) maint print msymbols" } + } + } + -re ".*$gdb_prompt $" { fail "maint print msymbols" } + timeout { fail "(timeout) maint print msymbols" } +} # Check that maint print msymbols allows relative pathnames set mydir [pwd] -gdb_test "cd ${objdir}" "Working directory [string_to_regexp ${objdir}]\..*" "cd to objdir" +gdb_test "cd ${objdir}" \ + "Working directory [string_to_regexp ${objdir}]\..*" \ + "cd to objdir" + gdb_test_multiple "maint print msymbols msymbols_output2 ${subdir}/${testfile}" "maint print msymbols" { -re "^maint print msymbols msymbols_output2 \[^\n\]*\r\n$gdb_prompt $" { gdb_test_multiple "shell ls msymbols_output2" "maint print msymbols" { @@ -354,15 +303,14 @@ gdb_test_multiple "maint print msymbols msymbols_output2 ${subdir}/${testfile}" fail "(timeout) maint print msymbols" } } -gdb_test "cd ${mydir}" "Working directory [string_to_regexp ${mydir}]\..*" "cd to mydir" +gdb_test "cd ${mydir}" \ + "Working directory [string_to_regexp ${mydir}]\..*" \ + "cd to mydir" + +gdb_test "maint print symbols" \ + "Arguments missing: an output file name and an optional symbol file name" \ + "maint print symbols w/o args" -send_gdb "maint print symbols\n" -gdb_expect { - -re "Arguments missing: an output file name and an optional symbol file name.*$gdb_prompt $"\ - { pass "maint print symbols w/o args" } - -re ".*$gdb_prompt $" { fail "maint print symbols w/o args" } - timeout { fail "(timeout) maint print symbols w/o args" } - } # Request symbols for one particular source file so that we don't try to # dump the symbol information for the entire C library - over 500MB nowadays @@ -370,30 +318,28 @@ gdb_expect { send_gdb "maint print symbols symbols_output ${srcdir}/${subdir}/${srcfile}\n" gdb_expect { - -re "^maint print symbols symbols_output \[^\n\]*\r\n$gdb_prompt $"\ - { - send_gdb "shell ls symbols_output\n" - gdb_expect { - -re "symbols_output\r\n$gdb_prompt $"\ - { - # See comments for `maint print psymbols'. - send_gdb "shell grep 'main(.*block' symbols_output\n" - gdb_expect { - -re "int main\\(int, char \\*\\*, char \\*\\*\\); block.*$gdb_prompt $"\ - { pass "maint print symbols" } - -re ".*$gdb_prompt $" { fail "maint print symbols" } - timeout { fail "(timeout) maint print symbols" } - } - gdb_test "shell rm -f symbols_output" "" - - } - -re ".*$gdb_prompt $" { fail "maint print symbols" } - timeout { fail "(timeout) maint print symbols" } - } - } - -re ".*$gdb_prompt $" { fail "maint print symbols" } - timeout { fail "(timeout) maint print symbols" } - } + -re "^maint print symbols symbols_output \[^\n\]*\r\n$gdb_prompt $" { + send_gdb "shell ls symbols_output\n" + gdb_expect { + -re "symbols_output\r\n$gdb_prompt $" { + # See comments for `maint print psymbols'. + send_gdb "shell grep 'main(.*block' symbols_output\n" + gdb_expect { + -re "int main\\(int, char \\*\\*, char \\*\\*\\); block.*$gdb_prompt $" { + pass "maint print symbols" + } + -re ".*$gdb_prompt $" { fail "maint print symbols" } + timeout { fail "(timeout) maint print symbols" } + } + gdb_test "shell rm -f symbols_output" "" + } + -re ".*$gdb_prompt $" { fail "maint print symbols" } + timeout { fail "(timeout) maint print symbols" } + } + } + -re ".*$gdb_prompt $" { fail "maint print symbols" } + timeout { fail "(timeout) maint print symbols" } +} set msg "maint print type" gdb_test_multiple "maint print type argc" $msg { @@ -404,14 +350,13 @@ gdb_test_multiple "maint print type argc" $msg { if [istarget "hppa*-*-11*"] { setup_xfail hppa*-*-*11* CLLbs14860 - send "maint print unwind &main\n" - expect { - -re ".*unwind_table_entry \\($hex\\):\r\n\tregion_start = $hex
\r\n\tregion_end = $hex \r\n\tflags = Args_stored Save_RP\r\n\tRegion_description = $hex\r\n\tEntry_FR = $hex\r\n\tEntry_GR = $hex\r\n\tTotal_frame_size = $hex\r\n$gdb_prompt $"\ - { pass "maint print unwind" } - -re ".*unwind_table_entry \\($hex\\):\r\n\tregion_start = $hex
\r\n\tregion_end = $hex \r\n\tflags = Args_stored Save_RP\r\n\tFLD = $hex\r\n\tFLD = $hex\r\n\tFLD = $hex\r\n\tFLD = $hex\r\n$gdb_prompt $"\ - { xfail "maint print unwind" } - -re ".*$gdb_prompt $" { xfail "maint info unwind" } - timeout { fail "(timeout) maint print unwind" } + gdb_test_multiple "maint print unwind &main" "maint print unwind" { + -re ".*unwind_table_entry \\($hex\\):\r\n\tregion_start = $hex
\r\n\tregion_end = $hex \r\n\tflags = Args_stored Save_RP\r\n\tRegion_description = $hex\r\n\tEntry_FR = $hex\r\n\tEntry_GR = $hex\r\n\tTotal_frame_size = $hex\r\n$gdb_prompt $" { + pass "maint print unwind" + } + -re ".*unwind_table_entry \\($hex\\):\r\n\tregion_start = $hex
\r\n\tregion_end = $hex \r\n\tflags = Args_stored Save_RP\r\n\tFLD = $hex\r\n\tFLD = $hex\r\n\tFLD = $hex\r\n\tFLD = $hex\r\n$gdb_prompt $" { + xfail "maint print unwind" + } } } @@ -432,39 +377,40 @@ set timeout [expr $timeout + 300] set text_section ".text" set data_section ".data" -send_gdb "maint info sections\n" -gdb_expect { - -re "Exec file:\r\n.*break($EXEEXT)?., file type.*ER_RO.*$gdb_prompt $" { - # Looks like RealView which uses different section names. - set text_section ER_RO - set data_section ER_RW - pass "maint info sections" - } - -re "Exec file:\r\n.*break($EXEEXT)?., file type.*$gdb_prompt $"\ - { pass "maint info sections" } - -re ".*$gdb_prompt $" { fail "maint info sections" } - timeout { fail "(timeout) maint info sections" } - } +gdb_test_multiple "maint info sections" "maint info sections" { + -re "Exec file:\r\n.*break($EXEEXT)?., file type.*ER_RO.*$gdb_prompt $" { + # Looks like RealView which uses different section names. + set text_section ER_RO + set data_section ER_RW + pass "maint info sections" + } + -re "Exec file:\r\n.*break($EXEEXT)?., file type.*$gdb_prompt $" { + pass "maint info sections" + } +} # Test for new option: maint info sections
# If you don't have a .text section, this will require tweaking. -send_gdb "maint info sections $text_section\n" -gdb_expect { - -re ".* \\.bss .*$gdb_prompt $" { fail "maint info sections .text" } - -re ".* $data_section .*$gdb_prompt $" { fail "maint info sections .text" } - -re ".* $text_section .*$gdb_prompt $" { pass "maint info sections .text" } - -re ".*$gdb_prompt $" { fail "maint info sections .text" } - timeout { fail "(timeout) maint info sections .text" } -} + +gdb_test_multiple "maint info sections $text_section" \ + "maint info sections .text" { + -re ".* \\.bss .*$gdb_prompt $" { + fail "maint info sections .text" + } + -re ".* $data_section .*$gdb_prompt $" { + fail "maint info sections .text" + } + -re ".* $text_section .*$gdb_prompt $" { + pass "maint info sections .text" + } + } # Test for new option: CODE section flag # If your data section is tagged CODE, xfail this test. -send_gdb "maint info sections CODE\n" -gdb_expect { + +gdb_test_multiple "maint info sections CODE" "maint info sections CODE" { -re ".* $data_section .*$gdb_prompt $" { fail "maint info sections CODE" } -re ".* $text_section .*$gdb_prompt $" { pass "maint info sections CODE" } - -re ".*$gdb_prompt $" { fail "maint info sections CODE" } - timeout { fail "(timeout) maint info sections CODE" } } # Test for new option: DATA section flag @@ -473,198 +419,96 @@ gdb_expect { # The "maint info sections DATA" test is marked for XFAIL on Cygwin, # because Windows has text sections marked DATA. setup_xfail "*-*-*cygwin*" -send_gdb "maint info sections DATA\n" -gdb_expect { + +gdb_test_multiple "maint info sections DATA" "maint info sections DATA" { -re ".* $text_section .*$gdb_prompt $" { fail "maint info sections DATA" } -re ".* $data_section .*$gdb_prompt $" { pass "maint info sections DATA" } -re ".* .rodata .*$gdb_prompt $" { pass "maint info sections DATA" } - -re ".*$gdb_prompt $" { fail "maint info sections DATA" } - timeout { fail "(timeout) maint info sections DATA" } } set bp_location6 [gdb_get_line_number "set breakpoint 6 here"] -send_gdb "maint info breakpoints\n" -gdb_expect { - -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex\[ \t\]+in main at.*break.c:$bp_location6 inf 1\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $"\ - { pass "maint info breakpoints" } - -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:$bp_location6 sspace 1\r\n\[ \t\]+breakpoint already hit 1 time\r\n-1\[ \t\]+shlib events\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex.*breakpoint already hit.*$gdb_prompt $"\ - { pass "maint info breakpoints (with shlib events)" } - -re ".*$gdb_prompt $" { fail "maint info breakpoints" } - timeout { fail "(timeout) maint info breakpoints" } +gdb_test_multiple "maint info breakpoints" "maint info breakpoints" { + -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex\[ \t\]+in main at.*break.c:$bp_location6 inf 1\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $" { + pass "maint info breakpoints" + } + -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:$bp_location6 sspace 1\r\n\[ \t\]+breakpoint already hit 1 time\r\n-1\[ \t\]+shlib events\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex.*breakpoint already hit.*$gdb_prompt $" { + pass "maint info breakpoints (with shlib events)" + } } -send_gdb "maint print\n" -gdb_expect { - -re "\"maintenance print\" must be followed by the name of a print command\\.\r\nList.*unambiguous\\..*$gdb_prompt $"\ - { pass "maint print w/o args" } - -re ".*$gdb_prompt $" { fail "maint print w/o args" } - timeout { fail "(timeout) maint print w/o args" } - } - -send_gdb "maint info\n" -gdb_expect { - -re "\"maintenance info\" must be followed by the name of an info command\\.\r\nList.*unambiguous\\..*$gdb_prompt $"\ - { pass "maint info w/o args" } - -re ".*$gdb_prompt $" { fail "maint info w/o args" } - timeout { fail "(timeout) maint info w/o args" } - } +gdb_test "maint print" \ + "\"maintenance print\" must be followed by the name of a print command\\.\r\nList.*unambiguous\\..*" \ + "maint print w/o args" -send_gdb "maint\n" -gdb_expect { - -re "\"maintenance\" must be followed by the name of a maintenance command\\.\r\nList.*unambiguous\\..*$gdb_prompt $"\ - { pass "maint w/o args" } - -re ".*$gdb_prompt $" { fail "maint w/o args" } - timeout { fail "(timeout) maint w/o args" } - } +gdb_test "maint info" \ + "\"maintenance info\" must be followed by the name of an info command\\.\r\nList.*unambiguous\\..*" \ + "maint info w/o args" +gdb_test "maint" \ + "\"maintenance\" must be followed by the name of a maintenance command\\.\r\nList.*unambiguous\\..*" \ + "maint w/o args" set timeout $oldtimeout #============test help on maint commands -send_gdb "help maint\n" -gdb_expect { - -re "Commands for use by GDB maintainers\\..*Includes commands to dump specific internal GDB structures in.*a human readable form, to cause GDB to deliberately dump core,.*to test internal functions such as the C../ObjC demangler, etc\\..*List of maintenance subcommands:.*maintenance check-symtabs.*maintenance demangle.*(maintenance dump-me.*)?maintenance info.*maintenance internal-error.*maintenance print.*maintenance set.*maintenance show.*maintenance space.*maintenance time.*Type.*help maintenance.*followed by maintenance subcommand name for full documentation\\..*Command name abbreviations are allowed if unambiguous\\..*$gdb_prompt $"\ - { pass "help maint" } - -re ".*$gdb_prompt $" { fail "help maint" } - timeout { fail "(timeout) help maint" } - } - +gdb_test "help maint" \ + "Commands for use by GDB maintainers\\..*Includes commands to dump specific internal GDB structures in.*a human readable form, to cause GDB to deliberately dump core,.*to test internal functions such as the C../ObjC demangler, etc\\..*List of maintenance subcommands:.*maintenance check-symtabs.*maintenance demangle.*(maintenance dump-me.*)?maintenance info.*maintenance internal-error.*maintenance print.*maintenance set.*maintenance show.*maintenance space.*maintenance time.*Type.*help maintenance.*followed by maintenance subcommand name for full documentation\\..*Command name abbreviations are allowed if unambiguous\\..*" -send_gdb "help maint check-symtabs\n" -gdb_expect { - -re "Check consistency of psymtabs and symtabs\\..*$gdb_prompt $"\ - { pass "help maint check-symtabs" } - -re ".*$gdb_prompt $" { fail "help maint check-symtabs" } - timeout { fail "(timeout) help maint check-symtabs" } - } +gdb_test "help maint check-symtabs" \ + "Check consistency of psymtabs and symtabs\\..*" -send_gdb "help maint space\n" -gdb_expect { - -re "Set the display of space usage\\.\r\nIf nonzero, will cause the execution space for each command to be\r\ndisplayed, following the command's output\\..*$gdb_prompt $"\ - { pass "help maint space" } - -re ".*$gdb_prompt $" { fail "help maint space" } - timeout { fail "(timeout) help maint space" } - } +gdb_test "help maint space" \ + "Set the display of space usage\\.\r\nIf nonzero, will cause the execution space for each command to be\r\ndisplayed, following the command's output\\..*" -send_gdb "help maint time\n" -gdb_expect { - -re "Set the display of time usage\\.\r\nIf nonzero, will cause the execution time for each command to be\r\ndisplayed, following the command's output\\..*$gdb_prompt $"\ - { pass "help maint time" } - -re ".*$gdb_prompt $" { fail "help maint time" } - timeout { fail "(timeout) help maint time" } - } +gdb_test "help maint time" \ + "Set the display of time usage\\.\r\nIf nonzero, will cause the execution time for each command to be\r\ndisplayed, following the command's output\\..*" -send_gdb "help maint demangle\n" -gdb_expect { - -re "Demangle a C\\+\\+/ObjC mangled name\\.\r\nCall internal GDB demangler routine to demangle a C\\+\\+ link name\r\nand prints the result\\..*$gdb_prompt $"\ - { pass "help maint demangle" } - -re ".*$gdb_prompt $" { fail "help maint demangle" } - timeout { fail "(timeout) help maint demangle" } - } +gdb_test "help maint demangle" \ + "Demangle a C\\+\\+/ObjC mangled name\\.\r\nCall internal GDB demangler routine to demangle a C\\+\\+ link name\r\nand prints the result\\..*" -send_gdb "help maint dump-me\n" -gdb_expect { - -re "Get fatal error; make debugger dump its core\\.\r\nGDB sets its handling of SIGQUIT back to SIG_DFL and then sends\r\nitself a SIGQUIT signal\\..*$gdb_prompt $"\ - { pass "help maint dump-me" } - -re ".*$gdb_prompt $" { fail "help maint dump-me" } - timeout { fail "(timeout) help maint dump-me" } - } +gdb_test "help maint dump-me" \ + "Get fatal error; make debugger dump its core\\.\r\nGDB sets its handling of SIGQUIT back to SIG_DFL and then sends\r\nitself a SIGQUIT signal\\..*" -send_gdb "help maint internal-error\n" -gdb_expect { - -re "Give GDB an internal error\\.\r\nCause GDB to behave as if an internal error was detected\\..*$gdb_prompt $"\ - { pass "help maint internal-error" } - -re ".*$gdb_prompt $" { fail "help maint internal-error" } - timeout { fail "(timeout) help maint internal-error" } - } +gdb_test "help maint internal-error" \ + "Give GDB an internal error\\.\r\nCause GDB to behave as if an internal error was detected\\..*" -send_gdb "help maint internal-warning\n" -gdb_expect { - -re "Give GDB an internal warning\\.\r\nCause GDB to behave as if an internal warning was reported\\..*$gdb_prompt $"\ - { pass "help maint internal-warning" } - -re ".*$gdb_prompt $" { fail "help maint internal-warning" } - timeout { fail "(timeout) help maint internal-warning" } - } +gdb_test "help maint internal-warning" \ + "Give GDB an internal warning\\.\r\nCause GDB to behave as if an internal warning was reported\\..*" -send_gdb "help maint print statistics\n" -gdb_expect { - -re "Print statistics about internal gdb state\\..*$gdb_prompt $"\ - { pass "help maint print statistics" } - -re ".*$gdb_prompt $" { fail "help maint print statistics" } - timeout { fail "(timeout) help maint print statistics" } - } +gdb_test "help maint print statistics" \ + "Print statistics about internal gdb state\\..*" gdb_test "help maint print dummy-frames" \ "Print the contents of the internal dummy-frame stack." -send_gdb "help maint print objfiles\n" -gdb_expect { - -re "Print dump of current object file definitions\\..*$gdb_prompt $"\ - { pass "help maint print objfiles" } - -re ".*$gdb_prompt $" { fail "help maint print objfiles" } - timeout { fail "(timeout) help maint print objfiles" } - } - -send_gdb "help maint print psymbols\n" -gdb_expect { - -re "Print dump of current partial symbol definitions\\.\r\nEntries in the partial symbol table are dumped to file OUTFILE\\.\r\nIf a SOURCE file is specified, dump only that file's partial symbols\\..*$gdb_prompt $"\ - { pass "help maint print psymbols" } - -re ".*$gdb_prompt $" { fail "help maint print psymbols" } - timeout { fail "(timeout) help maint print psymbols" } - } +gdb_test "help maint print objfiles" \ + "Print dump of current object file definitions\\..*" -send_gdb "help maint print msymbols\n" -gdb_expect { - -re "Print dump of current minimal symbol definitions\\.\r\nEntries in the minimal symbol table are dumped to file OUTFILE\\.\r\nIf a SOURCE file is specified, dump only that file's minimal symbols\\..*$gdb_prompt $"\ - { pass "help maint print msymbols" } - -re ".*$gdb_prompt $" { fail "help maint print msymbols" } - timeout { fail "(timeout) help maint print msymbols" } - } +gdb_test "help maint print psymbols" \ + "Print dump of current partial symbol definitions\\.\r\nEntries in the partial symbol table are dumped to file OUTFILE\\.\r\nIf a SOURCE file is specified, dump only that file's partial symbols\\..*" -send_gdb "help maint print symbols\n" -gdb_expect { - -re "Print dump of current symbol definitions\\.\r\nEntries in the full symbol table are dumped to file OUTFILE\\.\r\nIf a SOURCE file is specified, dump only that file's symbols\\..*$gdb_prompt $"\ - { pass "help maint print symbols" } - -re ".*$gdb_prompt $" { fail "help maint print symbols" } - timeout { fail "(timeout) help maint print symbols" } - } +gdb_test "help maint print msymbols" \ + "Print dump of current minimal symbol definitions\\.\r\nEntries in the minimal symbol table are dumped to file OUTFILE\\.\r\nIf a SOURCE file is specified, dump only that file's minimal symbols\\..*" +gdb_test "help maint print symbols" \ + "Print dump of current symbol definitions\\.\r\nEntries in the full symbol table are dumped to file OUTFILE\\.\r\nIf a SOURCE file is specified, dump only that file's symbols\\..*" -send_gdb "help maint print type\n" -gdb_expect { - -re "Print a type chain for a given symbol\\.\r\nFor each node in a type chain, print the raw data for each member of\r\nthe type structure, and the interpretation of the data\\..*$gdb_prompt $"\ - { pass "help maint print type" } - -re ".*$gdb_prompt $" { fail "help maint print type" } - timeout { fail "(timeout) help maint print type" } - } +gdb_test "help maint print type" \ + "Print a type chain for a given symbol\\.\r\nFor each node in a type chain, print the raw data for each member of\r\nthe type structure, and the interpretation of the data\\..*" if [istarget "hppa*-*-*"] { - send_gdb "help maint print unwind\n" - gdb_expect { - -re "Print unwind table entry at given address\\..*$gdb_prompt $"\ - { pass "help maint print unwind" } - -re ".*$gdb_prompt $" { fail "help maint print unwind" } - timeout { fail "(timeout) help maint print unwind" } - } + gdb_test "help maint print unwind" \ + "Print unwind table entry at given address\\..*" } -send_gdb "help maint info sections\n" -gdb_expect { - -re "List the BFD sections of the exec and core files\\..*$gdb_prompt $"\ - { pass "help maint info sections" } - -re ".*$gdb_prompt $" { fail "help maint info sections" } - timeout { fail "(timeout) help maint info sections" } - } +gdb_test "help maint info sections" \ + "List the BFD sections of the exec and core files\\..*" +gdb_test "help maint info breakpoints" \ + "Status of all breakpoints, or breakpoint number NUMBER.*" -send_gdb "help maint info breakpoints\n" -gdb_expect { --re "Status of all breakpoints, or breakpoint number NUMBER.*$gdb_prompt $" { pass "help maint info breakpoints" } - -re ".*$gdb_prompt $" { fail "help maint info breakpoints" } - timeout { fail "(timeout) help maint info breakpoints" } - } #send_gdb "help maint info breakpoints\n" #expect { @@ -674,13 +518,8 @@ gdb_expect { # timeout { fail "(timeout) help maint info breakpoints" } # } -send_gdb "help maint info\n" -gdb_expect { - -re "Commands for showing internal info about the program being debugged.*unambiguous\\..*$gdb_prompt $"\ - { pass "help maint info" } - -re ".*$gdb_prompt $" { fail "help maint info" } - timeout { fail "(timeout) help maint info" } - } +gdb_test "help maint info" \ + "Commands for showing internal info about the program being debugged.*unambiguous\\..*" test_prefix_command_help {"maint print" "maintenance print"} { "Maintenance command for printing GDB internal state\\.\[\r\n\]+" @@ -696,18 +535,11 @@ test_prefix_command_help {"maint" "maintenance"} { #set oldtimeout $timeout #set timeout [expr $timeout + 300] -send_gdb "maint dump-me\n" -gdb_expect { - -re "Should GDB dump core.*\\(y or n\\) $"\ - { send_gdb "n\n" - gdb_expect { - -re ".*$gdb_prompt $" { pass "maint dump-me" } - timeout { fail "(timeout) maint dump-me" } - } - } - -re ".*$gdb_prompt $" { fail "maint dump-me" } - timeout { fail "(timeout) maint dump-me" } - } +gdb_test_multiple "maint dump-me" "maint dump-me" { + -re "Should GDB dump core.*\\(y or n\\) $" { + gdb_test "n" ".*" "maint dump-me" + } +} send_gdb "maint internal-error\n" gdb_expect { diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp index b4df1b1b4d1..b22b7f4ab8e 100644 --- a/gdb/testsuite/gdb.base/miscexprs.exp +++ b/gdb/testsuite/gdb.base/miscexprs.exp @@ -69,239 +69,95 @@ if ![runto_main] then { continue } -send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $" - - send_gdb "cont\n" - gdb_expect { - -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" { - send_gdb "up\n" - gdb_expect { - -re ".*main.*$gdb_prompt $" { - pass "up from marker1" - } - -re ".*$gdb_prompt $" { - fail "up from marker1" - } - timeout { fail "up from marker1 (timeout)" } - } - } - -re "$gdb_prompt $" { fail "continue to marker1" } - timeout { fail "(timeout) continue to marker1" } - } +gdb_test "break marker1" "" "" + +gdb_test "cont" \ + "Break.* marker1 \\(\\) at .*:$decimal.*" \ + "continue to marker1" + +gdb_test "up" " main .*" "up from marker1" global hex -send_gdb "print &ibig.i\[0\]\n" -gdb_expect { - -re ".\[0-9\]* = \\(int \\*\\) $hex.*$gdb_prompt $" { - pass "print value of &ibig.i\[0\]" - } - -re ".*$gdb_prompt $" { fail "print value of &ibig.i\[0\]" } - timeout { fail "(timeout) print value of &ibig.i\[0\]" } - } - -send_gdb "print &cbig.c\[0\]\n" -gdb_expect { +gdb_test "print &ibig.i\[0\]" " = \\(int \\*\\) $hex" \ + "print value of &ibig.i\[0\]" + +gdb_test_multiple "print &cbig.c\[0\]" "print value of &cbig.c\[0\]" { -re ".\[0-9\]* = $hex \"\".*$gdb_prompt $" { pass "print value of &cbig.c\[0\]" - } + } -re ".\[0-9\]* = $hex \"*\".*$gdb_prompt $" { pass "print value of &cbig.c\[0\]" - } - -re ".*$gdb_prompt $" { fail "print value of &cbig.c\[0\]" } - timeout { fail "(timeout) print value of &cbig.c\[0\]" } - } - -send_gdb "print &fbig.f\[0\]\n" -gdb_expect { - -re ".\[0-9\]* = \\(float \\*\\) $hex.*$gdb_prompt $" { - pass "print value of &fbig.f\[0\]" - } - -re ".*$gdb_prompt $" { fail "print value of &fbig.f\[0\]" } - timeout { fail "(timeout) print value of &fbig.f\[0\]" } - } - -send_gdb "print &dbig.d\[0\]\n" -gdb_expect { - -re ".\[0-9\]* = \\(double \\*\\) $hex.*$gdb_prompt $" { - pass "print value of &dbig.d\[0\]" - } - -re ".*$gdb_prompt $" { fail "print value of &dbig.d\[0\]" } - timeout { fail "(timeout) print value of &dbig.d\[0\]" } - } - -send_gdb "print &sbig.s\[0\]\n" -gdb_expect { + } +} + +gdb_test "print &fbig.f\[0\]" " = \\(float \\*\\) $hex" \ + "print value of &fbig.f\[0\]" + +gdb_test "print &dbig.d\[0\]" " = \\(double \\*\\) $hex" \ + "print value of &dbig.d\[0\]" + +gdb_test_multiple "print &sbig.s\[0\]" "print value of &sbig.s\[0\]" { -re ".\[0-9\]* = \\(short \\*\\) $hex.*$gdb_prompt $" { pass "print value of &sbig.s\[0\]" } -re ".\[0-9\]* = \\(short int \\*\\) $hex.*$gdb_prompt $" { pass "print value of &sbig.s\[0\]" } - -re ".*$gdb_prompt $" { fail "print value of &sbig.s\[0\]" } - timeout { fail "(timeout) print value of &sbig.s\[0\]" } - } +} -send_gdb "print &lbig.l\[0\]\n" -gdb_expect { +gdb_test_multiple "print &lbig.l\[0\]" "print value of &lbig.l\[0\]" { -re ".\[0-9\]* = \\(long \\*\\) $hex.*$gdb_prompt $" { pass "print value of &lbig.l\[0\]" } -re ".\[0-9\]* = \\(long int \\*\\) $hex.*$gdb_prompt $" { pass "print value of &lbig.l\[0\]" } - -re ".*$gdb_prompt $" { fail "print value of &lbig.l\[0\]" } - timeout { fail "(timeout) print value of &lbig.l\[0\]" } - } - - -send_gdb "print ibig.i\[100\] | 1\n" -gdb_expect { - -re ".\[0-9\]* = 5.*$gdb_prompt $" { - pass "print value of ibig.i\[100\] | 1" - } - -re ".*$gdb_prompt $" { fail "print value of ibig.i\[100\] | 1" } - timeout { fail "(timeout) print value of ibig.i\[100\] | 1" } - } - - -send_gdb "print sbig.s\[90\] & 127\n" -gdb_expect { - -re ".\[0-9\]* = 127.*$gdb_prompt $" { - pass "print value of sbig.s\[90\] & 127" - } - -re ".*$gdb_prompt $" { fail "print value of sbig.s\[90\] & 127" } - timeout { fail "(timeout) print value of sbig.s\[90\] & 127" } - } - -send_gdb "print !ibig.i\[100\]\n" -gdb_expect { - -re ".\[0-9\]* = $false.*$gdb_prompt $" { - pass "print value of !ibig.i\[100\]" - } - -re ".*$gdb_prompt $" { fail "print value of !ibig.i\[100\]" } - timeout { fail "(timeout) print value of !ibig.i\[100\]" } - } - -send_gdb "print !sbig.s\[90\]\n" -gdb_expect { - -re ".\[0-9\]* = $false.*$gdb_prompt $" { - pass "print value of !sbig.s\[90\]" - } - -re ".*$gdb_prompt $" { fail "print value of !sbig.s\[90\]" } - timeout { fail "(timeout) print value of !sbig.s\[90\]" } - } - - -send_gdb "print !fbig.f\[100\]\n" -gdb_expect { - -re ".\[0-9\]* = $false.*$gdb_prompt $" { - pass "print value of !ibig.i\[100\]" - } - -re ".*$gdb_prompt $" { fail "print value of !ibig.i\[100\]" } - timeout { fail "(timeout) print value of !ibig.i\[100\]" } - } - -send_gdb "print !dbig.d\[202\]\n" -gdb_expect { - -re ".\[0-9\]* = $false.*$gdb_prompt $" { - pass "print value of !ibig.i\[100\]" - } - -re ".*$gdb_prompt $" { fail "print value of !ibig.i\[100\]" } - timeout { fail "(timeout) print value of !ibig.i\[100\]" } - } - - - -send_gdb "print sbig.s\[90\] * 10\n" -gdb_expect { - -re ".\[0-9\]* = 2550.*$gdb_prompt $" { - pass "print value of !sbig.s\[90\] * 10" - } - -re ".*$gdb_prompt $" { fail "print value of !sbig.s\[90\] * 10" } - timeout { fail "(timeout) print value of !sbig.s\[90\] * 10" } - } - -send_gdb "print ibig.i\[100\] * sbig.s\[90\]\n" -gdb_expect { - -re ".\[0-9\]* = 1275.*$gdb_prompt $" { - pass "print value of ibig.i\[100\] * sbig.s\[90\]" - } - -re ".*$gdb_prompt $" { fail "print value of ibig.i\[100\] * sbig.s\[90\]" } - timeout { fail "(timeout) print value of ibig.i\[100\] * sbig.s\[90\]" } - } - -send_gdb "print fbig.f\[100\] * dbig.d\[202\]\n" -gdb_expect { - -re ".\[0-9\]* = 119.99\[0-9\]*.*$gdb_prompt $" { - pass "print value of fbig.f\[100\] * dbig.d\[202\]" - } - -re ".*$gdb_prompt $" { fail "print value of fbig.f\[100\] * dbig.d\[202\]" } - timeout { fail "(timeout) print value of fbig.f\[100\] * dbig.d\[202\]" } - } - -send_gdb "print !(sbig.s\[90\] * 2)\n" -gdb_expect { - -re ".\[0-9\]* = $false.*$gdb_prompt $" { - pass "print value of !(sbig.s\[90\] * 2)" - } - -re ".*$gdb_prompt $" { fail "print value of !(sbig.s\[90\] * 2)" } - timeout { fail "(timeout) print value of !(sbig.s\[90\] * 2)" } - } - - -send_gdb "print sizeof(sbig)\n" -gdb_expect { - -re ".\[0-9\]* = 800.*$gdb_prompt $" { - pass "print value of sizeof(sbig)" - } - -re ".*$gdb_prompt $" { fail "print value of sizeof(sbig)" } - timeout { fail "(timeout) print value of sizeof(sbig)" } - } - - -send_gdb "print sizeof(cbig)\n" -gdb_expect { - -re ".\[0-9\]* = 100.*$gdb_prompt $" { - pass "print value of sizeof(cbig)" - } - -re ".*$gdb_prompt $" { fail "print value of sizeof(cbig)" } - timeout { fail "(timeout) print value of sizeof(cbig)" } - } - - -send_gdb "print sizeof(lbig)/sizeof(long)\n" -gdb_expect { - -re ".\[0-9\]* = 900.*$gdb_prompt $" { - pass "print value of sizeof(lbig)/sizeof(long)" - } - -re ".*$gdb_prompt $" { fail "print value of sizeof(lbig)/sizeof(long)" } - timeout { fail "(timeout) print value of sizeof(lbig)/sizeof(long)" } - } - -send_gdb "print ibig.i\[100\] << 2\n" -gdb_expect { - -re ".\[0-9\]* = 20.*$gdb_prompt $" { - pass "print value of ibig.i\[100\] << 2" - } - -re ".*$gdb_prompt $" { fail "print value of ibig.i\[100\] << 2" } - timeout { fail "(timeout) print value of ibig.i\[100\] << 2" } - } - -send_gdb "print sbig.s\[90\] >> 4\n" -gdb_expect { - -re ".\[0-9\]* = 15.*$gdb_prompt $" { - pass "print value of sbig.s\[90\] >> 4" - } - -re ".*$gdb_prompt $" { fail "print value of sbig.s\[90\] >> 4" } - timeout { fail "(timeout) print value of sbig.s\[90\] >> 4" } - } - -send_gdb "print lbig.l\[333\] >> 6\n" -gdb_expect { - -re ".\[0-9\]* = 15624999.*$gdb_prompt $" { - pass "print value of lbig.l\[333\] >> 6" - } - -re ".*$gdb_prompt $" { fail "print value of lbig.l\[333\] >> 6" } - timeout { fail "(timeout) print value of lbig.l\[333\] >> 6" } - } +} + +gdb_test "print ibig.i\[100\] | 1" " = 5" \ + "print value of ibig.i\[100\] | 1" + +gdb_test "print sbig.s\[90\] & 127" " = 127" \ + "print value of sbig.s\[90\] & 127" + +gdb_test "print !ibig.i\[100\]" " = $false" \ + "print value of !ibig.i\[100\]" + +gdb_test "print !sbig.s\[90\]" " = $false" \ + "print value of !sbig.s\[90\]" + +gdb_test "print !fbig.f\[100\]" " = $false" \ + "print value of !ibig.i\[100\]" + +gdb_test "print !dbig.d\[202\]" " = $false" \ + "print value of !ibig.i\[100\]" + +gdb_test "print sbig.s\[90\] * 10" " = 2550" \ + "print value of !sbig.s\[90\] * 10" + +gdb_test "print ibig.i\[100\] * sbig.s\[90\]" " = 1275" \ + "print value of ibig.i\[100\] * sbig.s\[90\]" + +gdb_test "print fbig.f\[100\] * dbig.d\[202\]" " = 119.99\[0-9\]*" \ + "print value of fbig.f\[100\] * dbig.d\[202\]" + +gdb_test "print !(sbig.s\[90\] * 2)" " = $false" \ + "print value of !(sbig.s\[90\] * 2)" + +gdb_test "print sizeof(sbig)" " = 800" "print value of sizeof sbig" + +gdb_test "print sizeof(cbig)" " = 100" "print value of sizeof cbig" + +gdb_test "print sizeof(lbig)/sizeof(long)" " = 900" \ + "print value of sizeof lbig / sizeof long" + +gdb_test "print ibig.i\[100\] << 2" " = 20" \ + "print value of ibig.i\[100\] << 2" + +gdb_test "print sbig.s\[90\] >> 4" " = 15" \ + "print value of sbig.s\[90\] >> 4" + +gdb_test "print lbig.l\[333\] >> 6" " = 15624999" \ + "print value of lbig.l\[333\] >> 6" + diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp index bc7cf52097e..a97da95315e 100644 --- a/gdb/testsuite/gdb.base/nodebug.exp +++ b/gdb/testsuite/gdb.base/nodebug.exp @@ -190,12 +190,17 @@ if [runto inner] then { # the inferior was compiled with -g. Thus, we expect this # testpoint to fail on HP-UX. if { [istarget "hppa*-hpux*"] } { - send_gdb "p/c array_index(\"abcdef\",2)\n" - gdb_expect { - -re ".*Suggest linking executable with -g.*$gdb_prompt $" { pass "p/c array_index(\"abcdef\",2)" } - -re ".*Cannot find __wdb_call_dummy in.*end.o.*" { pass "p/c array_index(\"abcdef\",2)" } - -re ".*99 'c'.*" { pass "p/c array_index(\"abcdef\",2)" } - timeout { fail "(timeout) p/c array_index" } + gdb_test_multiple "p/c array_index(\"abcdef\",2)" \ + "p/c array_index(\"abcdef\",2)" { + -re ".*Suggest linking executable with -g.*$gdb_prompt $" { + pass "p/c array_index(\"abcdef\",2)" + } + -re ".*Cannot find __wdb_call_dummy in.*end.o.*" { + pass "p/c array_index(\"abcdef\",2)" + } + -re ".*99 'c'.*" { + pass "p/c array_index(\"abcdef\",2)" + } } } else { # We need to up this because this can be really slow on some boards. diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp index 3e739abee90..32b3396fa46 100644 --- a/gdb/testsuite/gdb.base/pointers.exp +++ b/gdb/testsuite/gdb.base/pointers.exp @@ -131,469 +131,153 @@ gdb_test "set variable v_int_pointer=&v_int_array\[0\]" "" "set pointer to begin gdb_test "set variable v_int_pointer2=&v_int_array\[1\]" "" "set pointer to end of array" -send_gdb "print *v_int_pointer\n" -gdb_expect { - -re ".*= 6.*$gdb_prompt $" { - pass "print object pointed to" - } - -re ".*$gdb_prompt $" { fail "print object pointed to" } - timeout { fail "(timeout) print object pointed to" } - } - -send_gdb "print *v_int_pointer2\n" -gdb_expect { - -re ".*= 18.*$gdb_prompt $" { - pass "print object pointed to" - } - -re ".*$gdb_prompt $" { fail "print object pointed to" } - timeout { fail "(timeout) print object pointed to" } - } - - -send_gdb "print v_int_pointer == v_int_pointer2\n" -gdb_expect { - -re ".*= $false.*$gdb_prompt $" { - pass "pointer1==pointer2" - } - -re ".*$gdb_prompt $" { fail "pointer1==pointer2" } - timeout { fail "(timeout) pointer1==pointer2" } - } - -send_gdb "print v_int_pointer != v_int_pointer2\n" -gdb_expect { - -re ".*= $true.*$gdb_prompt $" { - pass "pointer1!=pointer2" - } - -re ".*$gdb_prompt $" { fail "pointer1!=pointer2" } - timeout { fail "(timeout) pointer1!=pointer2" } - } - - -send_gdb "print v_int_pointer <= v_int_pointer2\n" -gdb_expect { - -re ".*= $true.*$gdb_prompt $" { - pass "pointer1<=pointer2" - } - -re ".*$gdb_prompt $" { fail "pointer1<=pointer2" } - timeout { fail "(timeout) pointer1<=pointer2" } - } - - -send_gdb "print v_int_pointer >= v_int_pointer2\n" -gdb_expect { - -re ".*= $false.*$gdb_prompt $" { - pass "pointer1>=pointer2" - } - -re ".*$gdb_prompt $" { fail "pointer1>=pointer2" } - timeout { fail "(timeout) pointer1>=pointer2" } - } - - -send_gdb "print v_int_pointer < v_int_pointer2\n" -gdb_expect { - -re ".*= $true.*$gdb_prompt $" { - pass "pointer1 v_int_pointer2\n" -gdb_expect { - -re ".*= $false.*$gdb_prompt $" { - pass "pointer1>pointer2" - } - -re ".*$gdb_prompt $" { fail "pointer1>pointer2" } - timeout { fail "(timeout) pointer1>pointer2" } - } +gdb_test "print *v_int_pointer" " = 6" "print object pointed to" +gdb_test "print *v_int_pointer2" " = 18" "print object pointed to \#2" -gdb_test "set variable y = *v_int_pointer++" "" "set y = *v_int_pointer++" -send_gdb "print y\n" -gdb_expect { - -re ".*= 6.*$gdb_prompt $" { - send_gdb "print *v_int_pointer\n" - gdb_expect { - -re ".*= 18.*$gdb_prompt $" { - pass "pointer assignment and increment" - } - -re ".*$gdb_prompt $" { fail "pointer assignment and increment" } - timeout { fail "(timeout) pointer assignment and increment" } - } - } - -re ".*$gdb_prompt $" { fail "pointer assignment and increment" } - timeout { fail "(timeout) pointer assignment and increment" } - } +gdb_test "print v_int_pointer == v_int_pointer2" " = $false" \ + "pointer1==pointer2" + +gdb_test "print v_int_pointer != v_int_pointer2" " = $true" \ + "pointer1!=pointer2" + +gdb_test "print v_int_pointer <= v_int_pointer2" " = $true" \ + "pointer1<=pointer2" + +gdb_test "print v_int_pointer >= v_int_pointer2" " = $false" \ + "pointer1>=pointer2" + +gdb_test "print v_int_pointer < v_int_pointer2" " = $true" \ + "pointer1 v_int_pointer2" " = $false" \ + "pointer1>pointer2" +gdb_test "set variable y = *v_int_pointer++" "" "set y = *v_int_pointer++" +gdb_test "print y" " = 6" "pointer assignment" +gdb_test "print *v_int_pointer" " = 18" "and post-increment" gdb_test "set variable y = *--v_int_pointer2" "" "set y = *--v_int_pointer2" -send_gdb "print y\n" -gdb_expect { - -re ".*= 6.*$gdb_prompt $" { - send_gdb "print *v_int_pointer2\n" - gdb_expect { - -re ".*= 6.*$gdb_prompt $" { - pass "pointer decrement and assignment" - } - -re ".*$gdb_prompt $" { fail "pointer decrement and assignment" } - timeout { fail "(timeout) pointer decrement and assignment" } - } - } - -re ".*$gdb_prompt $" { fail "pointer decrement and assignment" } - timeout { fail "(timeout) pointer decrement and assignment" } - } - -gdb_test "set variable y =v_int_pointer-v_int_pointer2" "" "set y =v_int_pointer-v_int_pointer2" -send_gdb "print y\n" -gdb_expect { - -re ".*= 1.*$gdb_prompt $" { - pass "pointer1-pointer2" - } - -re ".*$gdb_prompt $" { fail "pointer1-pointer2" } - timeout { fail "(timeout) pointer1-pointer2" } - } - -gdb_test "set variable v_int_pointer=v_int_array" "" "set v_int_pointer=v_int_array" -send_gdb "print *v_int_pointer\n" -gdb_expect { - -re ".*= 6.*$gdb_prompt $" { - pass "print array element through pointer" - } - -re ".*$gdb_prompt $" { fail "print array element through pointer" } - timeout { fail "(timeout) print array element through pointer" } - } - - -send_gdb "print *(v_int_pointer+1)\n" -gdb_expect { - -re ".*= 18.*$gdb_prompt $" { - pass "print array element through pointer" - } - -re ".*$gdb_prompt $" { fail "print array element through pointer" } - timeout { fail "(timeout) print array element through pointer" } - } +gdb_test "print y" " = 6" "pointer assignment" +gdb_test "print *v_int_pointer2" " = 6" "and pre-decrement" + + + +gdb_test "set variable y =v_int_pointer-v_int_pointer2" "" \ + "set y =v_int_pointer-v_int_pointer2" +gdb_test "print y" " = 1" "pointer1-pointer2" + + +gdb_test "set variable v_int_pointer=v_int_array" "" \ + "set v_int_pointer=v_int_array" +gdb_test "print *v_int_pointer" " = 6" \ + "print array element through pointer" + +gdb_test "print *(v_int_pointer+1)" " = 18" \ + "print array element through pointer \#2" + # test print elements of array through pointers -send_gdb "print (*rptr)\[0\]\n" -gdb_expect { - -re ".*= 0.*$gdb_prompt $" { - pass "print array element through pointer" - } - -re ".*$gdb_prompt $" { fail "print array element through pointer" } - timeout { fail "(timeout) print array element through pointer" } - } - -send_gdb "print (*rptr)\[1\]\n" -gdb_expect { - -re ".*= 1.*$gdb_prompt $" { - pass "print array element through pointer" - } - -re ".*$gdb_prompt $" { fail "print array element through pointer" } - timeout { fail "(timeout) print array element through pointer" } - } - - -send_gdb "print (*rptr)\[2\]\n" -gdb_expect { - -re ".*= 2.*$gdb_prompt $" { - pass "print array element through pointer" - } - -re ".*$gdb_prompt $" { fail "print array element through pointer" } - timeout { fail "(timeout) print array element through pointer" } - } +gdb_test "print (*rptr)\[0\]" " = 0" \ + "print array element through pointer \#3" + +gdb_test "print (*rptr)\[1\]" " = 1" \ + "print array element through pointer \#4" + +gdb_test "print (*rptr)\[2\]" " = 2" \ + "print array element through pointer \#5" gdb_test "set variable rptr = rptr+1" "" "increment rptr" -send_gdb "print (*rptr)\[0\]\n" -gdb_expect { - -re ".*= 3.*$gdb_prompt $" { - pass "print array element through pointer" - } - -re ".*$gdb_prompt $" { fail "print array element through pointer" } - timeout { fail "(timeout) print array element through pointer" } - } - - -send_gdb "print (*rptr)\[1\]\n" -gdb_expect { - -re ".*= 4.*$gdb_prompt $" { - pass "print array element through pointer" - } - -re ".*$gdb_prompt $" { fail "print array element through pointer" } - timeout { fail "(timeout) print array element through pointer" } - } - - -send_gdb "print (*rptr)\[2\]\n" -gdb_expect { - -re ".*= 5.*$gdb_prompt $" { - pass "print array element through pointer" - } - -re ".*$gdb_prompt $" { fail "print array element through pointer" } - timeout { fail "(timeout) print array element through pointer" } - } - - -send_gdb "print *( *(matrix+1) +2)\n" -gdb_expect { - -re ".*= 5.*$gdb_prompt $" { - pass "print array element w/ pointer arithmetic" - } - -re ".*$gdb_prompt $" { fail "print array element w/ pointer arithemtic" } - timeout { fail "(timeout) print array element w/ pointer arithmetic" } - } - - -send_gdb "print **ptr_to_ptr_to_float\n" -gdb_expect { - -re ".*= 100.*$gdb_prompt $" { - pass "print through ptr to ptr" - } - -re ".*$gdb_prompt $" { fail "print through ptr to ptr" } - timeout { fail "(timeout) print through ptr to ptr" } - } +gdb_test "print (*rptr)\[0\]" " = 3" \ + "print array element through pointer \#6" -# tests for pointers -# with elementary type variables and pointers. -# +gdb_test "print (*rptr)\[1\]" " = 4" \ + "print array element through pointer \#7" -send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $" - -send_gdb "cont\n" -gdb_expect { - -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" { - pass "continue to marker1" - send_gdb "up\n" - gdb_expect { - -re ".*more_code.*$gdb_prompt $" { - pass "up from marker1" - } - -re ".*$gdb_prompt $" { - fail "up from marker1" - } - timeout { fail "up from marker1 (timeout)" } - } - } - -re "$gdb_prompt $" { - fail "continue to marker1" - } - timeout { - fail "continue to marker1 (timeout)" - } -} +gdb_test "print (*rptr)\[2\]" " = 5" \ + "print array element through pointer \#8" +gdb_test "print *( *(matrix+1) +2)" " = 5" \ + "print array element w/ pointer arithmetic" -send_gdb "print *pUC\n" -gdb_expect { - -re ".\[0-9\]* = 21 \'.025\'.*$gdb_prompt $" { - pass "print value of *pUC" - } - -re ".*$gdb_prompt $" { fail "print value of *pUC" } - timeout { fail "(timeout) print value of *pUC" } - } +gdb_test "print **ptr_to_ptr_to_float" " = 100" \ + "print through ptr to ptr" +# tests for pointers +# with elementary type variables and pointers. +# -send_gdb "ptype pUC\n" -gdb_expect { - -re "type = unsigned char \\*.*$gdb_prompt $" { pass "ptype pUC" } - -re ".*$gdb_prompt $" { fail "ptype pUC" } - timeout { fail "(timeout) ptype pUC" } -} +gdb_test "break marker1" "" "" +gdb_test "cont" "Break.* marker1 \\(\\) at .*:$decimal.*" \ + continue to marker1" +gdb_test "up" "more_code.*" "up from marker1" + +gdb_test "print *pUC" " = 21 \'.025\'.*" "print value of *pUC" -send_gdb "print *pS\n" -gdb_expect { - -re ".\[0-9\]* = -14.*$gdb_prompt $" { - pass "print value of *pS" - } - -re ".*$gdb_prompt $" { fail "print value of *pS" } - timeout { fail "(timeout) print value of *pS" } - } +gdb_test "ptype pUC" "type = unsigned char \\*" "ptype pUC" +gdb_test "print *pS" " = -14" "print value of *pS" -send_gdb "ptype pS\n" -gdb_expect { +gdb_test_multiple "ptype pS" "ptype pS" { -re "type = short \\*.*$gdb_prompt $" { pass "ptype pS" } -re "type = short int \\*.*$gdb_prompt $" { pass "ptype pS" } - -re ".*$gdb_prompt $" { fail "ptype pS" } - timeout { fail "(timeout) ptype pS" } -} +} -send_gdb "print *pUS\n" -gdb_expect { - -re ".\[0-9\]* = 7.*$gdb_prompt $" { - pass "print value of *pUS" - } - -re ".*$gdb_prompt $" { fail "print value of *pUS" } - timeout { fail "(timeout) print value of *pUS" } - } +gdb_test "print *pUS" " = 7" "print value of *pUS" - -send_gdb "ptype pUS\n" -gdb_expect { +gdb_test_multiple "ptype pUS" "ptype pUS" { -re "type = unsigned short \\*.*$gdb_prompt $" { pass "ptype pUS" } -re "type = short unsigned int \\*.*$gdb_prompt $" { pass "ptype pUS" } - -re ".*$gdb_prompt $" { fail "ptype pUS" } - timeout { fail "(timeout) ptype pUS" } } -send_gdb "print *pI\n" -gdb_expect { - -re ".\[0-9\]* = 102.*$gdb_prompt $" { - pass "print value of *pI" - } - -re ".*$gdb_prompt $" { fail "print value of *pI" } - timeout { fail "(timeout) print value of *pI" } - } - - -send_gdb "ptype pI\n" -gdb_expect { - -re "type = int \\*.*$gdb_prompt $" { pass "ptype pI" } - -re ".*$gdb_prompt $" { fail "ptype pI" } - timeout { fail "(timeout) ptype pI" } -} +gdb_test "print *pI" " = 102" "print value of *pI" -send_gdb "print *pUI\n" -gdb_expect { - -re ".\[0-9\]* = 1002.*$gdb_prompt $" { - pass "print value of *pUI" - } - -re ".*$gdb_prompt $" { fail "print value of *pUI" } - timeout { fail "(timeout) print value of *pUI" } - } - - -send_gdb "ptype pUI\n" -gdb_expect { - -re "type = unsigned int \\*.*$gdb_prompt $" { pass "ptype pUI" } - -re ".*$gdb_prompt $" { fail "ptype pUI" } - timeout { fail "(timeout) ptype pUI" } -} +gdb_test "ptype pI" "type = int \\*" "ptype pI" -send_gdb "print *pL\n" -gdb_expect { - -re ".\[0-9\]* = -234.*$gdb_prompt $" { - pass "print value of *pL" - } - -re ".*$gdb_prompt $" { fail "print value of *pL" } - timeout { fail "(timeout) print value of *pL" } - } - - -send_gdb "ptype pL\n" -gdb_expect { - -re "type = long \\*.*$gdb_prompt $" { pass "ptype pL" } - -re "type = long int \\*.*$gdb_prompt $" { pass "ptype pL" } - -re ".*$gdb_prompt $" { fail "ptype pL" } - timeout { fail "(timeout) ptype pL" } -} +gdb_test "print *pUI" " = 1002" "print value of *pUI" + +gdb_test "ptype pUI" "type = unsigned int \\*" "ptype pUI" + +gdb_test "print *pL" " = -234" "print value of *pL" -send_gdb "print *pUL\n" -gdb_expect { - -re ".\[0-9\]* = 234.*$gdb_prompt $" { - pass "print value of *pUL" - } - -re ".*$gdb_prompt $" { fail "print value of *pUL" } - timeout { fail "(timeout) print value of *pUL" } - } +gdb_test_multiple "ptype pL" "ptype pL" { + -re "type = long \\*.*$gdb_prompt $" { pass "ptype pL" } + -re "type = long int \\*.*$gdb_prompt $" { pass "ptype pL" } +} +gdb_test "print *pUL" " = 234" "print value of *pUL" -send_gdb "ptype pUL\n" -gdb_expect { +gdb_test_multiple "ptype pUL" "ptype pUL" { -re "type = unsigned long \\*.*$gdb_prompt $" { pass "ptype pUL" } -re "type = long unsigned int \\*.*$gdb_prompt $" { pass "ptype pUL" } - -re ".*$gdb_prompt $" { fail "ptype pUL" } - timeout { fail "(timeout) ptype pUL" } } -send_gdb "print *pF\n" -gdb_expect { - -re ".\[0-9\]* = 1.2\[0-9\]*e\\+0?10.*$gdb_prompt $" { - pass "print value of *pF" - } - -re ".*$gdb_prompt $" { fail "print value of *pF" } - timeout { fail "(timeout) print value of *pF" } - } - - -send_gdb "ptype pF\n" -gdb_expect { - -re "type = float \\*.*$gdb_prompt $" { pass "ptype pF" } - -re ".*$gdb_prompt $" { fail "ptype pF" } - timeout { fail "(timeout) ptype pF" } -} +gdb_test "print *pF" " = 1.2\[0-9\]*e\\+0?10" "print value of *pF" -send_gdb "print *pD\n" -gdb_expect { - -re ".\[0-9\]* = -1.2\[0-9\]*e\\-0?37.*$gdb_prompt $" { - pass "print value of *pD" - } - -re ".*$gdb_prompt $" { fail "print value of *pD" } - timeout { fail "(timeout) print value of *pD" } - } - - -send_gdb "ptype pD\n" -gdb_expect { - -re "type = double \\*.*$gdb_prompt $" { pass "ptype pD" } - -re ".*$gdb_prompt $" { fail "ptype pD" } - timeout { fail "(timeout) ptype pD" } -} +gdb_test "ptype pF" "type = float \\*" "ptype pF" -send_gdb "print ******ppppppC\n" -gdb_expect { - -re ".\[0-9\]* = 65 \'A\'.*$gdb_prompt $" { - pass "print value of ******ppppppC" - } - -re ".*$gdb_prompt $" { fail "print value of ******ppppppC" } - timeout { fail "(timeout) print value of ******ppppppC" } - } - - -send_gdb "ptype pC\n" -gdb_expect { - -re "type = char \\*.*$gdb_prompt $" { pass "ptype pC" } - -re ".*$gdb_prompt $" { fail "ptype pC" } - timeout { fail "(timeout) ptype pC" } -} +gdb_test "print *pD" " = -1.2\[0-9\]*e\\-0?37" "print value of *pD" -send_gdb "ptype ppC\n" -gdb_expect { - -re "type = char \\*\\*.*$gdb_prompt $" { pass "ptype ppC" } - -re ".*$gdb_prompt $" { fail "ptype ppC" } - timeout { fail "(timeout) ptype ppC" } -} +gdb_test "ptype pD" "type = double \\*" "ptype pD" -send_gdb "ptype pppC\n" -gdb_expect { - -re "type = char \\*\\*\\*.*$gdb_prompt $" { pass "ptype pppC" } - -re ".*$gdb_prompt $" { fail "ptype pppC" } - timeout { fail "(timeout) ptype pppC" } -} +gdb_test "print ******ppppppC" " = 65 \'A\'" \ + "print value of ******ppppppC" -send_gdb "ptype ppppC\n" -gdb_expect { - -re "type = char \\*\\*\\*\\*.*$gdb_prompt $" { pass "ptype ppppC" } - -re ".*$gdb_prompt $" { fail "ptype ppppC" } - timeout { fail "(timeout) ptype ppppC" } -} +gdb_test "ptype pC" "type = char \\*" "ptype pC" -send_gdb "ptype pppppC\n" -gdb_expect { - -re "type = char \\*\\*\\*\\*\\*.*$gdb_prompt $" { pass "ptype pppppC" } - -re ".*$gdb_prompt $" { fail "ptype pppppC" } - timeout { fail "(timeout) ptype pppppC" } -} +gdb_test "ptype ppC" "type = char \\*\\*" "ptype ppC" -send_gdb "ptype ppppppC\n" -gdb_expect { - -re "type = char \\*\\*\\*\\*\\*\\*.*$gdb_prompt $" { pass "ptype ppppppC" } - -re ".*$gdb_prompt $" { fail "ptype ppppppC" } - timeout { fail "(timeout) ptype ppppppC" } -} +gdb_test "ptype pppC" "type = char \\*\\*\\*" "ptype pppC" + +gdb_test "ptype ppppC" "type = char \\*\\*\\*\\*" "ptype ppppC" + +gdb_test "ptype pppppC" "type = char \\*\\*\\*\\*\\*" "ptype pppppC" + +gdb_test "ptype ppppppC" "type = char \\*\\*\\*\\*\\*\\*" "ptype ppppppC" # Regression test for a crash. diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp index b1942f08890..05ab9c92aba 100644 --- a/gdb/testsuite/gdb.base/ptype.exp +++ b/gdb/testsuite/gdb.base/ptype.exp @@ -58,18 +58,15 @@ gdb_load ${binfile} # with stabs compilers which fail to use a nameless stab (such as # pre-2.4.5 versions of gcc and most non-gcc compilers). -send_gdb "ptype red1\n" -gdb_expect { - -re "type = enum primary1_tag \{red1, green1, blue1\}.*$gdb_prompt $"\ - { - # The workaround is in effect. As this is a compiler, not GDB, - # bug, we'll make it a PASS but perhaps it should be an XFAIL. - pass "ptype unnamed enumeration member (worked around)" - } - -re "type = enum \{red1, green1, blue1\}.*$gdb_prompt $"\ - { pass "ptype unnamed enumeration member" } - -re ".*$gdb_prompt $" { fail "ptype unnamed enumeration member" } - timeout { fail "(timeout) ptype unnamed enumeration member" } +gdb_test_multiple "ptype red1" "ptype unnamed enumeration member" { + -re "type = enum primary1_tag \{red1, green1, blue1\}.*$gdb_prompt $" { + # The workaround is in effect. As this is a compiler, not GDB, + # bug, we'll make it a PASS but perhaps it should be an XFAIL. + pass "ptype unnamed enumeration member (worked around)" + } + -re "type = enum \{red1, green1, blue1\}.*$gdb_prompt $" { + pass "ptype unnamed enumeration member" + } } # @@ -571,8 +568,7 @@ proc ptype_maybe_prototyped { id prototyped plain { overprototyped "NO-MATCH" } eval "set $var \$val" } - send_gdb "ptype $id\n" - gdb_expect { + gdb_test_multiple "ptype $id" "ptype $id" { -re "type = $prototyped\[\r\n\]+$gdb_prompt $" { pass "ptype $id" } @@ -586,12 +582,6 @@ proc ptype_maybe_prototyped { id prototyped plain { overprototyped "NO-MATCH" } } fail "ptype $id (compiler doesn't emit unprototyped types)" } - -re "$gdb_prompt $" { - fail "ptype $id" - } - timeout { - fail "ptype $id (timeout)" - } } }