Cosmetics in test scripts
Some versions of "which" print on stderr.
diff --git a/tests/compat.sh b/tests/compat.sh
index 3b19e85..5eff44f 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -25,7 +25,7 @@
: ${GNUTLS_SERV:=gnutls-serv}
# do we have a recent enough GnuTLS?
-if ( which $GNUTLS_CLI && which $GNUTLS_SERV ) >/dev/null; then
+if ( which $GNUTLS_CLI && which $GNUTLS_SERV ) >/dev/null 2>&1; then
G_VER="$( $GNUTLS_CLI --version | head -n1 )"
if echo "$G_VER" | grep '@VERSION@' > /dev/null; then # git version
PEER_GNUTLS=" GnuTLS"
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index f87ede5..7f64df2 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -107,7 +107,7 @@
# skip next test if GnuTLS isn't available
requires_gnutls() {
if [ -z "${GNUTLS_AVAILABLE:-}" ]; then
- if ( which "$GNUTLS_CLI" && which "$GNUTLS_SERV" ) >/dev/null; then
+ if ( which "$GNUTLS_CLI" && which "$GNUTLS_SERV" ) >/dev/null 2>&1; then
GNUTLS_AVAILABLE="YES"
else
GNUTLS_AVAILABLE="NO"
@@ -229,7 +229,7 @@
# wait for server to start: two versions depending on lsof availability
wait_server_start() {
- if which lsof >/dev/null; then
+ if which lsof >/dev/null 2>&1; then
# make sure we don't loop forever
( sleep "$DOG_DELAY"; echo "SERVERSTART TIMEOUT"; kill $MAIN_PID ) &
DOG_PID=$!