From f123013881b21fb3631ff61af235435b7614e4ec Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Sat, 29 Jun 2024 09:06:11 +0200 Subject: [PATCH] test.sh: Always use ss when available --- VERSION | 2 +- test.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index af0cc87..7ea56a3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -"1.8.0.0" +"1.8.0.0+" diff --git a/test.sh b/test.sh index f70ad89..d356398 100755 --- a/test.sh +++ b/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 ;;