tests: skip old socat silently

I've seen enough logs with verbose socat output for now. Let's
make it quiet.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/tests/functions.sh b/tests/functions.sh
index 74622b0682ebf5a9c7d7e040b357ca6ebd478736..5246605e06e93182fdda8f8384bce9b49bb87ca2 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -699,22 +699,23 @@ function ts_init_socket_to_file {
        ts_check_prog "socat"
        rm -f "$socket" "$outfile"
 
+       # if socat is too old for these options we'll skip it below
        socat -u UNIX-LISTEN:$socket,fork,max-children=1,backlog=128 \
-               STDOUT > "$outfile" &
+               STDOUT > "$outfile" 2>/dev/null &
        pid=$!
 
        # check for running background process
-       if [ "$pid" -le "0" ] || ! kill -s 0 "$pid"; then
+       if [ "$pid" -le "0" ] || ! kill -s 0 "$pid" &>/dev/null; then
                ts_skip "unable to run socat"
        fi
        # wait for the socket listener
-       if ! socat -u /dev/null UNIX-CONNECT:$socket,retry=30,interval=0.1; then
-               kill -9 "$pid"
-               ts_skip "timeout waiting for socket"
+       if ! socat -u /dev/null UNIX-CONNECT:$socket,retry=30,interval=0.1 &>/dev/null; then
+               kill -9 "$pid" &>/dev/null
+               ts_skip "timeout waiting for socat socket"
        fi
        # check socket again
-       if ! socat -u /dev/null UNIX-CONNECT:$socket; then
-               kill -9 "$pid"
-               ts_skip "socket stopped listening"
+       if ! socat -u /dev/null UNIX-CONNECT:$socket &>/dev/null; then
+               kill -9 "$pid" &>/dev/null
+               ts_skip "socat socket stopped listening"
        fi
 }