From 3c5c3649729ba3f94f9d28f10aa2270c8c7e4aa9 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 15 May 2020 11:22:47 +0100 Subject: [PATCH] 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 * gdb.multi/multi-kill.exp (start_inferior): Remove 'testpid' parameter. Refer to namespace variable directly. (testpid): Declare as namespace variable. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.multi/multi-kill.exp | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 93ad65b32a..b35d10e01b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-05-15 Pedro Alves + + * 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 * gdb.multi/multi-kill.exp: Wrap in namespace. diff --git a/gdb/testsuite/gdb.multi/multi-kill.exp b/gdb/testsuite/gdb.multi/multi-kill.exp index 03bf8449cf..b4853a1ea4 100644 --- a/gdb/testsuite/gdb.multi/multi-kill.exp +++ b/gdb/testsuite/gdb.multi/multi-kill.exp @@ -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 } }