OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix gdb.multi/multi-kill.exp 

The previous patch misssed declaring the 'testpid' array as namespace
variable.  While it at, might as well go back to having start_inferior
refer to the "global" testpid, using "variable" too.

gdb/testsuite/ChangeLog:
2020-05-15  Pedro Alves  <palves@redhat.com>

	* gdb.multi/multi-kill.exp (start_inferior): Remove
	'testpid' parameter.  Refer to namespace variable directly.
	(testpid): Declare as namespace variable.
This commit is contained in:
Pedro Alves 2020-05-15 11:22:47 +01:00
parent 272c36b87f
commit 3c5c364972
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2020-05-15 Pedro Alves <palves@redhat.com>
* gdb.multi/multi-kill.exp (start_inferior): Remove
'testpid' parameter. Refer to namespace variable directly.
(testpid): Declare as namespace variable.
2020-05-15 Pedro Alves <palves@redhat.com>
* gdb.multi/multi-kill.exp: Wrap in namespace.

11
gdb/testsuite/gdb.multi/multi-kill.exp
View File

@ -44,9 +44,9 @@ namespace eval $testfile {
# Start inferior NUM and record its PID in the TESTPID array.
proc start_inferior {num testpid} {
proc start_inferior {num} {
with_test_prefix "start_inferior $num" {
upvar $testpid tpid
variable testpid
global binfile srcfile
if {$num != 1} {
@ -62,8 +62,8 @@ proc start_inferior {num testpid} {
gdb_run_cmd
gdb_test "" ".*reakpoint .*, initialized .*${srcfile}.*" "run"
set tpid($num) [get_integer_valueof "pid" -1]
if {$tpid($num) == -1} {
set testpid($num) [get_integer_valueof "pid" -1]
if {$testpid($num) == -1} {
return -1
}
@ -76,10 +76,11 @@ proc start_inferior {num testpid} {
set NUM_INFS 10
# The array holding each inferior's PID, indexed by inferior number.
variable testpid
array set testpid {}
for {set i 1} {$i <= $NUM_INFS} {incr i} {
if {[start_inferior $i testpid] < 0} {
if {[start_inferior $i] < 0} {
return -1
}
}