From 3f9e0d3242c0e874c5b88ec5e6a5e2ac7e8388ce Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Tue, 1 Jun 2010 17:22:33 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.base/commands.exp (begin commands on watch): Remove excessive trailing newline. * gdb.mi/mi-nsintrall.exp (-gdb-show non-stop): Likewise. * gdb.java/jmisc.exp (p *args\n): Rename to ... (p *args): ... here and remove excessive trailing newline. --- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.base/commands.exp | 2 +- gdb/testsuite/gdb.java/jmisc.exp | 2 +- gdb/testsuite/gdb.mi/mi-nsintrall.exp | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5d50914ee4f..8b868a97efe 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-06-01 Jan Kratochvil + + * gdb.base/commands.exp (begin commands on watch): Remove excessive + trailing newline. + * gdb.mi/mi-nsintrall.exp (-gdb-show non-stop): Likewise. + * gdb.java/jmisc.exp (p *args\n): Rename to ... + (p *args): ... here and remove excessive trailing newline. + 2010-05-31 Joel Brobecker * gdb.base/subst.exp: Fix call to gdb_test with empty message. diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index 5ffadcb4263..3f7415dbd35 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -284,7 +284,7 @@ proc watchpoint_command_test {} { if {$wp_id == -1} {return} - gdb_test_multiple "commands $wp_id\n" "begin commands on watch" { + gdb_test_multiple "commands $wp_id" "begin commands on watch" { -re "Type commands for breakpoint.*, one per line.*>$" { pass "begin commands on watch" } diff --git a/gdb/testsuite/gdb.java/jmisc.exp b/gdb/testsuite/gdb.java/jmisc.exp index d1cf2cb4957..b3292a3b3ed 100644 --- a/gdb/testsuite/gdb.java/jmisc.exp +++ b/gdb/testsuite/gdb.java/jmisc.exp @@ -81,7 +81,7 @@ if ![set_lang_java] then { gdb_test "p args" \ "\\\$1 = java\.lang\.String\\\[]@\[a-f0-9]+" - gdb_test_multiple "p *args\n" "p *args\n" { + gdb_test_multiple "p *args" "p *args" { -re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $" { pass "p *args" } diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp index cd277b259e9..33f8daa2918 100644 --- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp +++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp @@ -37,7 +37,7 @@ mi_gdb_reinitialize_dir $srcdir/$subdir mi_gdb_load $binfile set supported 0 -gdb_test_multiple "-gdb-show non-stop\n" "" { +gdb_test_multiple "-gdb-show non-stop" "" { -re ".*\\^done,value=\"off\",supported=\"(\[^\"\]+)\"\r\n$mi_gdb_prompt$" { if { $expect_out(1,string) == "1" } { set supported 1 -- 2.30.2