From bb36fed9a567f43e0903c329b06e3a6c225e4add Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Wed, 25 Apr 2007 15:56:15 +0000 Subject: [PATCH] * gdb.base/sigaltstack.exp: Use 'srcfile' in error message, not the undefined 'module' variable. * gdb.base/siginfo.exp: Likewise. * gdb.base/sigstep.exp: Likewise. * lib/gdbserver-support.exp (gdb_target_cmd): Quote serialport. * lib/mi-support.exp (mi_gdb_target_cmd): Likewise. --- gdb/testsuite/ChangeLog | 10 ++++++++++ gdb/testsuite/gdb.base/sigaltstack.exp | 2 +- gdb/testsuite/gdb.base/siginfo.exp | 2 +- gdb/testsuite/gdb.base/sigstep.exp | 2 +- gdb/testsuite/lib/gdbserver-support.exp | 3 ++- gdb/testsuite/lib/mi-support.exp | 3 ++- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 57c7041176..d918e221d1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2007-04-25 Vladimir Prus + + * gdb.base/sigaltstack.exp: Use 'srcfile' in error + message, not the undefined 'module' variable. + * gdb.base/siginfo.exp: Likewise. + * gdb.base/sigstep.exp: Likewise. + * lib/gdbserver-support.exp (gdb_target_cmd): Quote + serialport. + * lib/mi-support.exp (mi_gdb_target_cmd): Likewise. + 2007-04-25 Corinna Vinschen * config/sim.exp (gdb_target_sim): Just return with -1 when setting diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp index 6ce7e4073d..aa4f1b1d60 100644 --- a/gdb/testsuite/gdb.base/sigaltstack.exp +++ b/gdb/testsuite/gdb.base/sigaltstack.exp @@ -39,7 +39,7 @@ set testfile sigaltstack set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested "Couldn't compile ${module}.c" + untested "Couldn't compile ${srcfile}.c" return -1 } diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp index 1ac7574fa5..fe57ef08bf 100644 --- a/gdb/testsuite/gdb.base/siginfo.exp +++ b/gdb/testsuite/gdb.base/siginfo.exp @@ -40,7 +40,7 @@ set testfile siginfo set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested "Couldn't compile ${module}.c" + untested "Couldn't compile ${srcfile}.c" return -1 } diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp index f5d5424c44..7fa31785a4 100644 --- a/gdb/testsuite/gdb.base/sigstep.exp +++ b/gdb/testsuite/gdb.base/sigstep.exp @@ -38,7 +38,7 @@ set testfile sigstep set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested "Couldn't compile ${module}.c" + untested "Couldn't compile ${srcfile}.c" return -1 } diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index 3bf974d319..b7d7708b1d 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -45,6 +45,7 @@ proc gdb_target_cmd { targetname serialport } { global gdb_prompt + set serialport_re [string_to_regexp $serialport] for {set i 1} {$i <= 3} {incr i} { send_gdb "target $targetname $serialport\n" gdb_expect 60 { @@ -59,7 +60,7 @@ proc gdb_target_cmd { targetname serialport } { verbose "Set target to $targetname" return 0 } - -re "Remote debugging using .*$serialport.*$gdb_prompt $" { + -re "Remote debugging using .*$serialport_re.*$gdb_prompt $" { verbose "Set target to $targetname" return 0 } diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 87e35c04fa..2482016e95 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -325,6 +325,7 @@ proc mi_gdb_reinitialize_dir { subdir } { proc mi_gdb_target_cmd { targetname serialport } { global mi_gdb_prompt + set serialport_re [string_to_regexp $serialport] for {set i 1} {$i <= 3} {incr i} { send_gdb "47-target-select $targetname $serialport\n" gdb_expect 60 { @@ -339,7 +340,7 @@ proc mi_gdb_target_cmd { targetname serialport } { verbose "Set target to $targetname"; return 0; } - -re "Remote debugging using .*$serialport.*$mi_gdb_prompt$" { + -re "Remote debugging using .*$serialport_re.*$mi_gdb_prompt$" { verbose "Set target to $targetname"; return 0; } -- 2.11.0