diff options
| -rw-r--r-- | gdb/testsuite/gdb.base/commands.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.guile/guile.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/python.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 10 |
5 files changed, 9 insertions, 9 deletions
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index ec2015ebef5..36918ed1a3f 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -725,7 +725,7 @@ maintenance deprecate set qqq_aaa" proc_with_prefix deprecated_command_alias_help_test {} { gdb_test_multiline "define real_command" \ - "define real_command" "End with a line saying just \"end\".." \ + "define real_command" "End with a line saying just \"end\"\\." \ "print 1" "" \ "end" "" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp b/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp index bd3ea5b5d54..d2c28a87923 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp @@ -88,7 +88,7 @@ gdb_test_multiple "maint info line-table $srcfile$" $test { -re -wrap "END *0x0*1 *$hex *Y *\r\n.*" { fail $gdb_test_name } - -re -wrap "END *$hex *$hex *Y *" { + -re -wrap "END *$hex *$hex *Y *\r\n" { pass $gdb_test_name } } diff --git a/gdb/testsuite/gdb.guile/guile.exp b/gdb/testsuite/gdb.guile/guile.exp index 7d0c063583d..ee8b2718178 100644 --- a/gdb/testsuite/gdb.guile/guile.exp +++ b/gdb/testsuite/gdb.guile/guile.exp @@ -63,7 +63,7 @@ gdb_test_multiline "show guile command" \ "(print 23)" "" \ "end" "" \ "end" "" \ - "show user zzq" "User command \"zzq\":.* guile.*\\(print 23\\).* end" + "show user zzq" "User command \"zzq\":.* guile.*\\(print 23\\).* end\r\n" gdb_test "source $host_source2_scm" "yes" "source source2.scm" diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp index 7e9ddaa6fcd..584e52c0661 100644 --- a/gdb/testsuite/gdb.python/python.exp +++ b/gdb/testsuite/gdb.python/python.exp @@ -80,7 +80,7 @@ gdb_test_multiline "show python command" \ "print (23)" "" \ "end" "" \ "end" "" \ - "show user zzq" "User command \"zzq\":.* python.*print \\(23\\).* end" + "show user zzq" "User command \"zzq\":.* python.*print \\(23\\).* end\r\n" gdb_test_multiline "indented multi-line python command" \ "python" "" \ diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index aed7e2d043c..50c10333df1 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -818,7 +818,7 @@ proc gdb_continue_to_breakpoint {name {location_pattern .*}} { -re "(?:Breakpoint|Temporary breakpoint) .* (at|in) $location_pattern\r\n$gdb_prompt $" { pass $full_name } - -re "\[\r\n\]*(?:$kfail_pattern)\[\r\n\]+$gdb_prompt $" { + -re "(?:$kfail_pattern)\r\n$gdb_prompt $" { kfail "gdb/25038" $full_name } } @@ -1126,7 +1126,7 @@ proc gdb_test_multiple { command message args } { if { $wrap_pattern } { # Wrap subst_item as is done for the gdb_test PATTERN argument. lappend $current_list \ - "\[\r\n\]*(?:$subst_item)\[\r\n\]+$prompt_regexp" + "(?:$subst_item)\r\n$prompt_regexp" set wrap_pattern 0 } else { lappend $current_list $subst_item @@ -1384,7 +1384,7 @@ proc gdb_test_multiline { name args } { foreach {input result} $args { incr inputnr if {[gdb_test_multiple $input "$name: input $inputnr: $input" { - -re "\[\r\n\]*($result)\[\r\n\]+($gdb_prompt | *>)$" { + -re "($result)\r\n($gdb_prompt | *>)$" { pass $gdb_test_name } }]} { @@ -7746,7 +7746,7 @@ proc get_valueof { fmt exp default {test ""} } { set val ${default} gdb_test_multiple "print${fmt} ${exp}" "$test" { - -re "\\$\[0-9\]* = (\[^\r\n\]*)\[\r\n\]*$gdb_prompt $" { + -re "\\$\[0-9\]* = (\[^\r\n\]*)\r\n$gdb_prompt $" { set val $expect_out(1,string) pass "$test" } @@ -7770,7 +7770,7 @@ proc get_local_valueof { exp default {test ""} } { set val ${default} gdb_test_multiple "info locals ${exp}" "$test" { - -re "$exp = (\[^\r\n\]*)\[\r\n\]*$gdb_prompt $" { + -re "$exp = (\[^\r\n\]*)\r\n$gdb_prompt $" { set val $expect_out(1,string) pass "$test" } |