This way running with -v will show interspersed output from both nettest
client and server. This helps to identify the order of events.
It is also required in order to make nettest fork in the background by
itself because shell capturing does not stop if the target forks.
This also fixes SC2166 warning:
Prefer [ p ] && [ q ] as [ p -a q ] is not well defined.
Signed-off-by: Leonard Crestez <cdleonard@xxxxxxxxx>
---
tools/testing/selftests/net/fcnal-test.sh | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/net/fcnal-test.sh b/tools/testing/selftests/net/fcnal-test.sh
index b7fda51deb3f..09cb35e16219 100755
--- a/tools/testing/selftests/net/fcnal-test.sh
+++ b/tools/testing/selftests/net/fcnal-test.sh
@@ -189,21 +189,19 @@ kill_procs()
done
}
do_run_cmd()
{
- local cmd="$*"
- local out
+ local rc cmd="$*"
- if [ "$VERBOSE" = "1" ]; then
+ if [[ "$VERBOSE" = "1" ]]; then
echo "COMMAND: ${cmd}"
- fi
-
- out=$($cmd 2>&1)
- rc=$?
- if [ "$VERBOSE" = "1" -a -n "$out" ]; then
- echo "$out"
+ $cmd
+ rc=$?
+ else
+ $cmd &> /dev/null
+ rc=$?
fi
return $rc
}
--
2.25.1
