diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.trace/actions.exp | 38 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.trace/while-stepping.exp | 11 | ||||
| -rw-r--r-- | gdb/testsuite/lib/trace-support.exp | 2 |
4 files changed, 23 insertions, 35 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7bfecc7..b331aee4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2010-03-24 Vladimir Prus <vladimir@codesourcery.com> + + * lib/trace-support.exp (gdb_trace_setactions): + Don't expect whitespace after ">" prompt. + * gdb.trace/actions.exp: Adjust for output changes. + * gdb.trace/while-stepping.exp: Likewise. + 2010-03-22 Jan Kratochvil <jan.kratochvil@redhat.com> * dg-extract-results.sh: Sync with GCC HEAD (import r155655, r157175 diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp index 7168501..4bdf3e4 100644 --- a/gdb/testsuite/gdb.trace/actions.exp +++ b/gdb/testsuite/gdb.trace/actions.exp @@ -88,8 +88,7 @@ gdb_trace_setactions "5.1b: set actions for first tracepoint" \ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+collect gdb_char_test. -\[\t \]+A\[\t \]+end. +\[\t \]+collect gdb_char_test. \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ "5.1c: verify actions set for first tracepoint" @@ -101,11 +100,9 @@ gdb_trace_setactions "5.1d: set actions for second tracepoint" \ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+collect gdb_char_test. -\[\t \]+A\[\t \]+end. +\[\t \]+collect gdb_char_test. \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+collect gdb_short_test. -\[\t \]+A\[\t \]+end. +\[\t \]+collect gdb_short_test. \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ "5.1e: verify actions set for second tracepoint" @@ -116,14 +113,11 @@ gdb_trace_setactions "5.2a: set actions for last (default) tracepoint" \ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+collect gdb_char_test. -\[\t \]+A\[\t \]+end. +\[\t \]+collect gdb_char_test. \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+collect gdb_short_test. -\[\t \]+A\[\t \]+end. +\[\t \]+collect gdb_short_test. \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+collect gdb_long_test. -\[\t \]+A\[\t \]+end." \ +\[\t \]+collect gdb_long_test." \ "5.1e: verify actions set for second tracepoint" # 5.3 replace actions set earlier @@ -135,14 +129,11 @@ gdb_trace_setactions "5.3a: reset actions for first tracepoint" \ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+collect gdb_struct1_test. -\[\t \]+A\[\t \]+end. +\[\t \]+collect gdb_struct1_test. \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+collect gdb_short_test. -\[\t \]+A\[\t \]+end. +\[\t \]+collect gdb_short_test. \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+collect gdb_long_test. -\[\t \]+A\[\t \]+end." \ +\[\t \]+collect gdb_long_test." \ "5.3b: verify actions set for first tracepoint" # @@ -184,7 +175,7 @@ gdb_test "actions [expr $trcpt2 + $trcpt3]" \ gdb_trace_setactions "5.7: invalid action" \ "$trcpt1" \ "print gdb_c_test" \ - "warning: .print gdb_c_test. is not a supported trace" + "'print gdb_c_test' is not a supported tracepoint action" # 5.8 help actions (collect, while-stepping, end) @@ -230,13 +221,10 @@ gdb_trace_setactions "5.10a: set teval action for second tracepoint" \ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+teval gdb_char_test. -\[\t \]+A\[\t \]+end. +\[\t \]+teval gdb_char_test. \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+teval \\\$tsv \\\+= 1. -\[\t \]+A\[\t \]+end. +\[\t \]+teval \\\$tsv \\\+= 1. \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. -\[\t \]+A\[\t \]+collect gdb_long_test. -\[\t \]+A\[\t \]+end." \ +\[\t \]+collect gdb_long_test." \ "5.10a: verify teval actions set for two tracepoints" diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp index c75ac4f..228f66a 100644 --- a/gdb/testsuite/gdb.trace/while-stepping.exp +++ b/gdb/testsuite/gdb.trace/while-stepping.exp @@ -71,15 +71,9 @@ gdb_trace_setactions "5.12: set stepcount to $stepcount" \ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. -\[\t \]+step count 12 .*" \ - "5.12: confirm stepcount set to $stepcount" - -gdb_test "info tracepoints" \ - "Num Type\[ \]+Disp Enb Address\[ \]+What.* -.*while-stepping $stepcount.*" \ +\[\t \]+while-stepping 12.*" \ "5.12: info trace shows \"while-stepping\"" - # 5.13 step out of context while collecting local variable # [deferred to dynamic test section] @@ -88,7 +82,7 @@ proc while_stepping_bogus_arg { bogus msgstring } { gdb_trace_setactions "$msgstring" \ "" \ - "while-stepping $bogus" "\[Ee\]rror|\[Ww\]arning" + "while-stepping $bogus" ".*bad step-count" } # 5.14 while-stepping (no argument) @@ -109,7 +103,6 @@ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. .*while-stepping $stepcount.* -.*end.* .*end.*" \ "5.16: confirm actions, step without collecting anything" diff --git a/gdb/testsuite/lib/trace-support.exp b/gdb/testsuite/lib/trace-support.exp index 6810903..631557d 100644 --- a/gdb/testsuite/lib/trace-support.exp +++ b/gdb/testsuite/lib/trace-support.exp @@ -121,7 +121,7 @@ proc gdb_trace_setactions { testname tracepoint args } { } exp_continue; } - -re "\(.*\)\[\r\n\]+\[ \t]*> $" { + -re "\(.*\)\[\r\n\]+\[ \t]*>$" { if { $expected_result != "" } { regsub "^\[^\r\n\]+\[\r\n\]+" "$expect_out(1,string)" "" out; if ![regexp $expected_result $out] { |