gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests failure on busybox systems. (#7916)

Browse Source
This commit is contained in:
Yossi Gottlieb 2020-10-18 14:50:29 +03:00 committed by GitHub
parent f328194d12
commit ef92f507dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/support/server.tcl
View File

@ -94,7 +94,7 @@ proc kill_server config {
proc is_alive config { proc is_alive config {
set pid [dict get $config pid] set pid [dict get $config pid]
if {[catch {exec ps -p $pid} err]} { if {[catch {exec kill -0 $pid} err]} {
return 0 return 0
} else { } else {
return 1 return 1

2
tests/support/util.tcl
View File

@ -508,7 +508,7 @@ proc populate {num prefix size} {
proc get_child_pid {idx} { proc get_child_pid {idx} {
set pid [srv $idx pid] set pid [srv $idx pid]
if {[string match {*Darwin*} [exec uname -a]]} { if {[file exists "/usr/bin/pgrep"]} {
set fd [open "|pgrep -P $pid" "r"] set fd [open "|pgrep -P $pid" "r"]
set child_pid [string trim [lindex [split [read $fd] \n] 0]] set child_pid [string trim [lindex [split [read $fd] \n] 0]]
} else { } else {