aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2010-06-01 17:22:33 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2010-06-01 17:22:33 +0000
commit3f9e0d3242c0e874c5b88ec5e6a5e2ac7e8388ce (patch)
treeb60aa153b5c9dba9bd43de26dbf08ea5fa7d3ce1
parentfa593d66d5696018bc8fb166f9e2a960d484ccd0 (diff)
downloadgdb-3f9e0d3242c0e874c5b88ec5e6a5e2ac7e8388ce.zip
gdb-3f9e0d3242c0e874c5b88ec5e6a5e2ac7e8388ce.tar.gz
gdb-3f9e0d3242c0e874c5b88ec5e6a5e2ac7e8388ce.tar.bz2
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.
-rw-r--r--gdb/testsuite/ChangeLog8
-rw-r--r--gdb/testsuite/gdb.base/commands.exp2
-rw-r--r--gdb/testsuite/gdb.java/jmisc.exp2
-rw-r--r--gdb/testsuite/gdb.mi/mi-nsintrall.exp2
4 files changed, 11 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5d50914..8b868a9 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-01 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * 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 <brobecker@adacore.com>
* 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 5ffadcb..3f7415d 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 d1cf2cb..b3292a3 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 cd277b2..33f8daa 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