Testsuite buglets

[Vladimir Prus <vladimir at codesourcery dot com>]

I've committed the attached patch, approved off-list by Daniel Jacobowitz, 
to fix minor issues with the testsuite:

1. In three places, testsuite use 'module' variable
in error messages, which variable does not exist.

2. In two places, the 'serialport' is passed to regexp
without quoting regexp metacharacters. So, when
serial port includes metacharacters, like "| some_stub some_args",
we're matching not quite what we wanted.

- Volodya

Index: gdb.base/sigaltstack.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/sigaltstack.exp,v
retrieving revision 1.6
diff -u -p -r1.6 sigaltstack.exp
--- gdb.base/sigaltstack.exp	9 Jan 2007 17:59:11 -0000	1.6
+++ gdb.base/sigaltstack.exp	25 Apr 2007 15:53:34 -0000
@@ -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
 }
 
Index: gdb.base/siginfo.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/siginfo.exp,v
retrieving revision 1.4
diff -u -p -r1.4 siginfo.exp
--- gdb.base/siginfo.exp	9 Jan 2007 17:59:11 -0000	1.4
+++ gdb.base/siginfo.exp	25 Apr 2007 15:53:34 -0000
@@ -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
 }
 
Index: gdb.base/sigstep.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/sigstep.exp,v
retrieving revision 1.13
diff -u -p -r1.13 sigstep.exp
--- gdb.base/sigstep.exp	9 Jan 2007 17:59:11 -0000	1.13
+++ gdb.base/sigstep.exp	25 Apr 2007 15:53:34 -0000
@@ -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
 }
 
Index: lib/gdbserver-support.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/gdbserver-support.exp,v
retrieving revision 1.4
diff -u -p -r1.4 gdbserver-support.exp
--- lib/gdbserver-support.exp	27 Mar 2007 17:59:38 -0000	1.4
+++ lib/gdbserver-support.exp	25 Apr 2007 15:53:34 -0000
@@ -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 serialp
 		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
 	    }
Index: lib/mi-support.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/mi-support.exp,v
retrieving revision 1.44
diff -u -p -r1.44 mi-support.exp
--- lib/mi-support.exp	14 Apr 2007 09:51:30 -0000	1.44
+++ lib/mi-support.exp	25 Apr 2007 15:53:34 -0000
@@ -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 seri
 		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;
 	    }

Attachment: testing.ChangeLog
Description: Text document