aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2010-01-08 12:03:36 +0000
committerJoel Brobecker <brobecker@gnat.com>2010-01-08 12:03:36 +0000
commit2de75e717cf6e60bcaf9ec42e92bb6a9d43d96d5 (patch)
tree291f8c505b63979c8cdfed3fd6cb22add7c695cb
parentfe00719b00b31015a727d0d4bd5b49dc96965259 (diff)
downloadgdb-2de75e717cf6e60bcaf9ec42e92bb6a9d43d96d5.zip
gdb-2de75e717cf6e60bcaf9ec42e92bb6a9d43d96d5.tar.gz
gdb-2de75e717cf6e60bcaf9ec42e92bb6a9d43d96d5.tar.bz2
* lib/gdb.exp (gdb_start_cmd): Move comment outside of gdb_expect
call, to avoid interruption.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/lib/gdb.exp4
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1e7ac86..0bc0466 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-08 Joel Brobecker <brobecker@adacore.com>
+
+ * lib/gdb.exp (gdb_start_cmd): Move comment outside of gdb_expect
+ call, to avoid interruption.
+
2010-01-08 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.stabs/weird.def (args93): New.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 4658c8d..fcaaf3c 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -312,13 +312,13 @@ proc gdb_start_cmd {args} {
}
send_gdb "start $args\n"
+ # Use -notransfer here so that test cases (like chng-sym.exp)
+ # may test for additional start-up messages.
gdb_expect 60 {
-re "The program .* has been started already.*y or n. $" {
send_gdb "y\n"
exp_continue
}
- # Use -notransfer here so that test cases (like chng-sym.exp)
- # may test for additional start-up messages.
-notransfer -re "Starting program: \[^\r\n\]*" {
return 0
}