diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 06520ab845..bad750b0a0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2001-05-19 Michael Chastain + + * gdb.base/callfuncs.exp: Make all test names unique. + * gdb.base/commands.exp: Make all test names unique. + * gdb.base/condbreak.exp: Make all test names unique. + * gdb.base/dbx.exp: Make all test names unique. + * gdb.base/default.exp: Make all test names unique. + * gdb.base/define.exp: Make all test names unique. Conform some FAIL + and TIMEOUT messages to their corresponding PASS message. + * gdb.base/ending-run.exp: Make all test names unique. + * gdb.base/long_long.exp: Remove duplicate test. + 2001-05-21 Kevin Buettner * gdb.base/finish.exp (finish_void): Allow "finish" command to diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp index dd7897d3aa..e66f9fdaa4 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -292,8 +292,10 @@ if { $hp_aCC_compiler } { # Make sure that malloc gets called and that the floating point unit # is initialized via a call to t_double_values. -gdb_test "next" "t_double_values\\(double_val1, double_val2\\);.*" -gdb_test "next" "t_structs_c\\(struct_val1\\);.*" +gdb_test "next" "t_double_values\\(double_val1, double_val2\\);.*" \ + "next to t_double_values" +gdb_test "next" "t_structs_c\\(struct_val1\\);.*" \ + "next to t_structs_c" # Save all register contents. do_get_all_registers diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index 31e85f649e..266948c780 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -184,7 +184,7 @@ proc infrun_breakpoint_command_test {} { return } - gdb_test "set args 6" "" "set args in progvar_simple_while_test" + gdb_test "set args 6" "" "set args in infrun_breakpoint_command_test" if { ![runto factorial] } then { gdb_suppress_tests } # Don't depend upon argument passing, since most simulators don't # currently support it. Bash value variable to be what we want. @@ -326,8 +326,8 @@ proc watchpoint_command_test {} { } send_gdb "end\n" gdb_expect { - -re "$gdb_prompt $" {pass "begin commands on watch"} - timeout {fail "(timeout) begin commands on watch"} + -re "$gdb_prompt $" {pass "end commands on watch"} + timeout {fail "(timeout) end commands on watch"} } send_gdb "continue\n" gdb_expect { @@ -351,7 +351,7 @@ proc test_command_prompt_position {} { # Don't depend upon argument passing, since most simulators don't # currently support it. Bash value variable to be what we want. delete_breakpoints - gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #2" + gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #3" gdb_test "p value=5" "" "set value to 5 in test_command_prompt_position" # All this test should do is print 0xdeadbeef once. gdb_test "if value == 1\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \ @@ -406,34 +406,34 @@ proc test_command_prompt_position {} { proc deprecated_command_test {} { gdb_test "maintenance deprecate blah" "Can't find command.*" \ - "tried to deprecate non-existsing command" + "tried to deprecate non-existing command" - gdb_test "maintenance deprecate p \"new_p\"" "" + gdb_test "maintenance deprecate p \"new_p\"" "" "maintenance deprecate p \"new_p\" /1/" gdb_test "p 5" \ "Warning: 'p', an alias for the command 'print' is deprecated.*Use 'new_p'.*" \ "p deprecated warning, with replacement" - gdb_test "p 5" ".\[0-9\]* = 5.*" "Deprecated warning goes away" + gdb_test "p 5" ".\[0-9\]* = 5.*" "Deprecated warning goes away /1/" - gdb_test "maintenance deprecate p \"new_p\"" "" + gdb_test "maintenance deprecate p \"new_p\"" "" "maintenance deprecate p \"new_p\" /2/" gdb_test "maintenance deprecate print \"new_print\"" "" gdb_test "p 5" \ "Warning: command 'print' \\(p\\) is deprecated.*Use 'new_print'.*" \ "both alias and command are deprecated" - gdb_test "p 5" ".\[0-9\]* = 5.*" "Deprecated warning goes away" + gdb_test "p 5" ".\[0-9\]* = 5.*" "Deprecated warning goes away /2/" gdb_test "maintenance deprecate set remote memory-read-packet-size \"srm\" " \ "" \ - "deprecate long comamnd" + "deprecate long command /1/" gdb_test "set remote memory-read-packet-size" \ "Warning: command 'set remote memory-read-packet-size' is deprecated.*Use 'srm'.*" \ - "long command deprecated" + "long command deprecated /1/" gdb_test "maintenance deprecate set remote memory-read-packet-size" \ "" \ - "deprecate long comamnd" + "deprecate long command /2/" gdb_test "set remote memory-read-packet-size" \ "Warning: command 'set remote memory-read-packet-size' is deprecated.*No alternative known.*" \ - "long command deprecated with no alternative." + "long command deprecated with no alternative /2/" gdb_test "maintenance deprecate" \ "\"maintenance deprecate\".*" \ diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp index 92d6880ccc..c234431f15 100644 --- a/gdb/testsuite/gdb.base/condbreak.exp +++ b/gdb/testsuite/gdb.base/condbreak.exp @@ -1,4 +1,4 @@ -# Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +# Copyright 1997, 1998, 1999, 2000, 2001 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 @@ -66,41 +66,32 @@ gdb_test "break main" \ # test conditional break at function # gdb_test "break marker1 if 1==1" \ - "Breakpoint.*at.* file .*$srcfile, line.*" \ - "break function if condition" + "Breakpoint.*at.* file .*$srcfile, line.*" -gdb_test "delete 2" \ - "" \ - "delete break" +gdb_test "delete 2" "" # # test conditional break at line number # gdb_test "break 79 if 1==1" \ - "Breakpoint.*at.* file .*$srcfile, line 79\\." \ - "break line if condition" + "Breakpoint.*at.* file .*$srcfile, line 79\\." -gdb_test "delete 3" \ - "" \ - "delete break" +gdb_test "delete 3" "" # # test conditional break at function # gdb_test "break marker1 if (1==1)" \ - "Breakpoint.*at.* file .*$srcfile, line.*" \ - "break function if (condition)" + "Breakpoint.*at.* file .*$srcfile, line.*" # # test conditional break at line number # gdb_test "break 79 if (1==1)" \ - "Breakpoint.*at.* file .*$srcfile, line 79\\." \ - "break line if (condition)" + "Breakpoint.*at.* file .*$srcfile, line 79\\." gdb_test "break marker2 if (a==43)" \ - "Breakpoint.*at.* file .*$srcfile, line.*" \ - "break function if (condition)" + "Breakpoint.*at.* file .*$srcfile, line.*" # # check to see what breakpoints are set diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index 08c3cd4f2e..9df3bda806 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -1,4 +1,4 @@ -# Copyright 1998, 1999 Free Software Foundation, Inc. +# Copyright 1998, 1999, 2001 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 @@ -306,13 +306,13 @@ proc test_whereis { } { #test_func # proc test_func { } { - gdb_test "cont" "" + gdb_test "cont" "" "cont 1" gdb_test "step" "" # This always fails, but it's not clear why. -sts 1999-08-17 setup_xfail "*-*-*" gdb_test "func sum" "'sum' not within current stack frame\." gdb_test "stop in sum" "Breakpoint.*at.*: file.*sum\.c, line 11\." - gdb_test "cont" + gdb_test "cont" "" "cont 2" # This always fails, but it's not clear why. -sts 1999-08-17 setup_xfail "*-*-*" gdb_test "func print_average" ".*in print_average.*\\(list=.*, low=0, high=6\\).*at.*average\.c:24\r\n24\[ \t\]+total = sum\\(list, low, high\\);" diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index 3df0368425..bc43143ac9 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -1,5 +1,5 @@ # Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000 +# 2000, 2001 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -328,6 +328,8 @@ setup_xfail "a29k-*-udi" gdb_test "info stack" "No stack." "info stack" #test info set # FIXME -- needs to match the entire output +# FIXME -- on native solaris 2.8, this test fails due to this line: +# prompt: Gdb's prompt is "(gdb) ".^M gdb_test "info set" "confirm: Whether to confirm potentially dangerous operations is o\[a-z\]*..*\[\r\n\]+history filename: The filename in which to record the command history is .*\[\r\n\]+listsize: Number of source lines gdb will list by default is 10.*" "info set" gdb_test "info symbol" "Argument required .address.." #test info source @@ -387,7 +389,7 @@ gdb_test "overlay auto" "" gdb_test "overlay off" "" gdb_test "overlay list" "No sections are mapped." gdb_test "overlay map" "Overlay debugging not enabled.*" "overlay map #1" -gdb_test "overlay unmap" "Overlay debugging not enabled.*" "overlay unmap #2" +gdb_test "overlay unmap" "Overlay debugging not enabled.*" "overlay unmap #1" gdb_test "overlay manual" "" "overlay manual #2" gdb_test "overlay map" "Argument required: name of an overlay section." "overlay map #2" gdb_test "overlay unmap" "Argument required: name of an overlay section." "overlay unmap #2" diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp index 2793c4b413..06ea1c0f4f 100644 --- a/gdb/testsuite/gdb.base/define.exp +++ b/gdb/testsuite/gdb.base/define.exp @@ -1,4 +1,4 @@ -# Copyright 1998, 1999 Free Software Foundation, Inc. +# Copyright 1998, 1999, 2001 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 @@ -160,8 +160,8 @@ gdb_expect { } } -re "$gdb_prompt $"\ - {fail "documenting user command: nextwhere"} - timeout {fail "(timeout) documenting user command: nextwhere"} + {fail "document user command: nextwhere"} + timeout {fail "(timeout) document user command: nextwhere"} } send_gdb "document nextwhere\n" @@ -170,13 +170,13 @@ gdb_expect { {send_gdb "A next command that first shows you where you're stepping from.\nend\n" gdb_expect { -re "$gdb_prompt $"\ - {pass "document user command: nextwhere"} - timeout {fail "(timeout) document user command: nextwhere"} + {pass "re-document user command: nextwhere"} + timeout {fail "(timeout) re-document user command: nextwhere"} } } -re "$gdb_prompt $"\ - {fail "documenting user command: nextwhere"} - timeout {fail "(timeout) documenting user command: nextwhere"} + {fail "re-document user command: nextwhere"} + timeout {fail "(timeout) re-document user command: nextwhere"} } send_gdb "help nextwhere\n" diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp index 714c0eddde..1552d364fa 100644 --- a/gdb/testsuite/gdb.base/ending-run.exp +++ b/gdb/testsuite/gdb.base/ending-run.exp @@ -56,7 +56,8 @@ gdb_test "b ending-run.c:1" ".*Breakpoint.*ending-run.c, line 1.*" \ "bpt at line before routine" gdb_test "b ending-run.c:13" \ - ".*Note.*also.*Breakpoint 2.*ending-run.c, line 13.*" + ".*Note.*also.*Breakpoint 2.*ending-run.c, line 13.*" \ + "b ending-run.c:13, one" # Set up to go to the next-to-last line of the program # @@ -81,7 +82,7 @@ gdb_expect { # Test some other "clear" combinations # gdb_test "b ending-run.c:1" ".*Breakpoint.*4.*" -gdb_test "b ending-run.c:13" ".*Note.*also.*Breakpoint.*5.*" +gdb_test "b ending-run.c:13" ".*Note.*also.*Breakpoint.*5.*" "b ending-run.c:13, two" gdb_test "cle ending-run.c:13" \ ".*Deleted breakpoint 5.*" "Only cleared 1 by line" diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp index a7f9af9639..87accdd47b 100644 --- a/gdb/testsuite/gdb.base/long_long.exp +++ b/gdb/testsuite/gdb.base/long_long.exp @@ -178,7 +178,6 @@ if { $target_bigendian_p } { gdb_test "p/t *(short *)&oct" ".*1010011100101110.*" gdb_test "p/a *(short *)&oct" ".*0xf*ffffa72e.*" gdb_test "p/c *(short *)&oct" ".* 46 '.'.*" - gdb_test "p/a *(short *)&oct" ".*0xf*ffffa72e.*" gdb_test "p/f *(short *)&oct" ".*-22738.*" gdb_test "x/x &oct" ".*0xa72ee539.*"