diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-03-07 20:25:57 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-03-07 20:25:57 +0000 |
| commit | d68dcbb953ec1b07118ac8c606a13bdda439933a (patch) | |
| tree | 10152248adb27c777fa0fe1f11ad1a3ce6aaf4b9 /gdb | |
| parent | e6edda56ff6f7bbb6f9ec0a2832d5935428f31c9 (diff) | |
| download | gdb-d68dcbb953ec1b07118ac8c606a13bdda439933a.zip gdb-d68dcbb953ec1b07118ac8c606a13bdda439933a.tar.gz gdb-d68dcbb953ec1b07118ac8c606a13bdda439933a.tar.bz2 | |
gdb/testsuite/
* gdb.trace/report.exp (12.1: trace report #1): New match for the
initial commands echo. New match for `Found trace'. Anchor all the
other matches. Anchor and match for `No trace frame found' the final
match.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.trace/report.exp | 20 |
2 files changed, 20 insertions, 7 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4611aa9..f98e365 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2011-03-07 Jan Kratochvil <jan.kratochvil@redhat.com> + + * gdb.trace/report.exp (12.1: trace report #1): New match for the + initial commands echo. New match for `Found trace'. Anchor all the + other matches. Anchor and match for `No trace frame found' the final + match. + 2011-03-07 Tom Tromey <tromey@redhat.com> * Makefile.in (TAGS): New target. diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp index fde3d65..7e929ff 100644 --- a/gdb/testsuite/gdb.trace/report.exp +++ b/gdb/testsuite/gdb.trace/report.exp @@ -296,31 +296,37 @@ gdb_test_multiple "print \$trace_file" "11.4: test \$trace_file" { # gdb_test_multiple "while \$trace_frame != -1\n output \$trace_file\n printf \", line \%d \(tracepoint #\%d\)\\n\", \$trace_line, \$tracepoint\n tfind\n end" "12.1: trace report #1" { - -re " line $testline1 .tracepoint .$tdp1" { + -re "> end\r\n" { + exp_continue + } + -re "^Found trace frame \[0-9\]+, tracepoint \[0-9\]+\r\n" { + exp_continue + } + -re "^\[^\r\n\]* line $testline1 .tracepoint .$tdp1\\)\r\n" { set linecount1 [expr $linecount1 + 1] exp_continue } - -re " line $testline2 .tracepoint .$tdp2" { + -re "^\[^\r\n\]* line $testline2 .tracepoint .$tdp2\\)\r\n" { set linecount2 [expr $linecount2 + 1] exp_continue } - -re " line $testline3 .tracepoint .$tdp3" { + -re "^\[^\r\n\]* line $testline3 .tracepoint .$tdp3\\)\r\n" { set linecount3 [expr $linecount3 + 1] exp_continue } - -re " line $testline4 .tracepoint .$tdp4" { + -re "^\[^\r\n\]* line $testline4 .tracepoint .$tdp4\\)\r\n" { set linecount4 [expr $linecount4 + 1] exp_continue } - -re " line $testline5 .tracepoint .$tdp5" { + -re "^\[^\r\n\]* line $testline5 .tracepoint .$tdp5\\)\r\n" { set linecount5 [expr $linecount5 + 1] exp_continue } - -re " line $testline6 .tracepoint .$tdp6" { + -re "^\[^\r\n\]* line $testline6 .tracepoint .$tdp6\\)\r\n" { set linecount6 [expr $linecount6 + 1] exp_continue } - -re ".*$gdb_prompt $" { + -re "^No trace frame found\r\n$gdb_prompt $" { if { ($linecount1 < 4) || ($linecount2 < 4) || ($linecount3 < 4) || ($linecount4 < 4) || ($linecount5 < 4) || ($linecount6 < 4) } { fail "12.1: trace report #1" } else { |