commit 03db6b0da133100953eb963f0d5e60c6b7c8cdf1
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Jun 26 15:45:30 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Jun 26 15:45:30 2015 +0200
tree 8fa82a5bfe07bcaa08320a618cee2d66d6456943
parent 4fd0b256a848f96cdadc83a940cb79d865fe0bf8

Cosmetics in test scripts

Some versions of "which" print on stderr.

tests/ssl-opt.sh

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=$!