diff options
| author | Rob Landley <rob@landley.net> | 2020-08-23 22:49:13 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2020-08-23 22:49:13 -0500 |
| commit | 152e32857a50d37eb05cceb901391a32a43eda10 (patch) | |
| tree | 70b8f88e42964904efba100d2eb57d9f30ad8e26 | |
| parent | 07a896862ddf65d150d4edc46be5914cffe11587 (diff) | |
| download | toybox-152e32857a50d37eb05cceb901391a32a43eda10.tar.gz | |
Teach VERBOSE to do more for xpect.
| -rw-r--r-- | scripts/runtest.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scripts/runtest.sh b/scripts/runtest.sh index 325cb1e4..89e632fc 100644 --- a/scripts/runtest.sh +++ b/scripts/runtest.sh @@ -180,6 +180,7 @@ txpect() # Run command with redirection through fifos NAME="$CMDNAME $1" CASE= + VERBOSITY= if [ $# -lt 2 ] || ! mkfifo in-$$ out-$$ err-$$ then @@ -195,7 +196,7 @@ txpect() # Loop through challenge/response pairs, with 2 second timeout while [ $# -gt 0 ] do - [ "$VERBOSE" == xpect ] && echo "$1" >&2 + VERBOSITY="$VERBOSITY"$'\n'"$1" LEN=$((${#1}-1)) CASE="$1" A= @@ -211,7 +212,7 @@ txpect() [ ${1::1} == 'E' ] && O=$ERR A= read -t2 $LARG A <&$O - [ "$VERBOSE" == xpect ] && printf '%s\n' "$A" >&2 + VERBOSITY="$VERBOSITY"$'\n'"$A" if [ $LEN -eq 0 ] then [ -z "$A" ] && { do_fail;break;} @@ -246,7 +247,12 @@ txpect() # In case we already closed it exec {IN}<&- {OUT}<&- {ERR}<&- - [ $# -eq 0 ] && do_pass + if [ $# -eq 0 ] + then + do_pass + else + [ ! -z "$VERBOSE" ] && echo "$VERBOSITY" >&2 + fi } # Recursively grab an executable and all the libraries needed to run it. |