mirror of
https://repo.or.cz/socat.git
synced 2024-12-22 15:32:35 +00:00
test.sh: Always use ss when available
This commit is contained in:
parent
2da070164d
commit
f123013881
2 changed files with 6 additions and 6 deletions
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
"1.8.0.0"
|
||||
"1.8.0.0+"
|
||||
|
|
10
test.sh
10
test.sh
|
@ -146,7 +146,7 @@ if type ip >/dev/null 2>&1; then
|
|||
fi
|
||||
|
||||
if type ss >/dev/null 2>&1; then
|
||||
# on Ubuntu-10 ss has differing output format
|
||||
# On Ubuntu-10 ss has differing output format (no "LISTEN"), use netstat then
|
||||
if ss -V |grep -q "^ss utility, iproute2-[2-6]"; then
|
||||
SS=$(type -p ss)
|
||||
else
|
||||
|
@ -17559,12 +17559,12 @@ if grep -q " W waitpid..: child .* exited with status 130" "${te}0"; then
|
|||
if [ "$DEBUG" ]; then cat "${te}0" >&2; fi
|
||||
numOK=$((numOK+1))
|
||||
else
|
||||
$PRINTF "$FAILED\n"
|
||||
$PRINTF "${YELLOW}FAILED (shell does not propagate SIGINT?${NORMAL}\n"
|
||||
echo "$CMD0 &"
|
||||
cat "${te}0" >&2
|
||||
numFAIL=$((numFAIL+1))
|
||||
listFAIL="$listFAIL $N"
|
||||
namesFAIL="$namesFAIL $NAME"
|
||||
numCANT=$((numCANT+1))
|
||||
listCANT="$listCANT $N"
|
||||
namesCANT="$namesCANT $NAME"
|
||||
fi
|
||||
fi # NUMCOND
|
||||
;;
|
||||
|
|
Loading…
Reference in a new issue