Andreas Schwab
2260ea0896
- close-wait-program.patch: Use separate kill command for each pid (bsc#1100206) - Use %license. OBS-URL: https://build.opensuse.org/request/show/623490 OBS-URL: https://build.opensuse.org/package/show/devel:tools/dejagnu?expand=0&rev=27
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
2018-07-06 Richard Biener <rguenther@suse.de>
|
|
|
|
* lib/remote.exp (close_wait_program): Use separate kill command
|
|
for each pid.
|
|
|
|
Index: dejagnu-1.6.1/lib/remote.exp
|
|
===================================================================
|
|
--- dejagnu-1.6.1.orig/lib/remote.exp
|
|
+++ dejagnu-1.6.1/lib/remote.exp
|
|
@@ -70,13 +70,16 @@ proc close_wait_program { program_id pid
|
|
# Tcl has no kill primitive, so we have to execute an external
|
|
# command in order to kill the process.
|
|
verbose "doing kill, pid is $pid"
|
|
- # Prepend "-" to generate the "process group ID" needed by
|
|
- # kill.
|
|
- set pgid "-$pid"
|
|
# Send SIGINT to give the program a better chance to interrupt
|
|
# whatever it might be doing and react to stdin closing.
|
|
# eg, in case of GDB, this should get it back to the prompt.
|
|
- exec sh -c "exec > /dev/null 2>&1 && (kill -2 $pgid || kill -2 $pid)"
|
|
+ # Do so separately for each PID in the list to avoid differences
|
|
+ # in return value behavior for kill between shells
|
|
+ foreach spid $pid {
|
|
+ # Prepend "-" to generate the "process group ID" needed by
|
|
+ # kill.
|
|
+ exec sh -c "exec > /dev/null 2>&1 && (kill -2 -$spid || kill -2 $spid)"
|
|
+ }
|
|
|
|
# If the program doesn't exit gracefully when stdin closes,
|
|
# we'll need to kill it. But only do this after 'wait'ing a
|
|
@@ -86,9 +89,15 @@ proc close_wait_program { program_id pid
|
|
# PID reuse race.
|
|
set secs 5
|
|
set sh_cmd "exec > /dev/null 2>&1"
|
|
- append sh_cmd " && sleep $secs && (kill -15 $pgid || kill -15 $pid)"
|
|
- append sh_cmd " && sleep $secs && (kill -9 $pgid || kill -9 $pid)"
|
|
- append sh_cmd " && sleep $secs"
|
|
+ append sh_cmd " && sleep $secs && ("
|
|
+ foreach spid $pid {
|
|
+ append sh_cmd "(kill -15 -$spid || kill -15 $spid);"
|
|
+ }
|
|
+ append sh_cmd ") && sleep $secs && ("
|
|
+ foreach spid $pid {
|
|
+ append sh_cmd "(kill -9 -$spid || kill -9 $spid);"
|
|
+ }
|
|
+ append sh_cmd ") && sleep $secs"
|
|
set exec_pid [exec sh -c "$sh_cmd" &]
|
|
}
|
|
verbose "pid is $pid"
|