Give sshd startup 5 more seconds.

[grml-unittests.git] / run_tests.sh

diff --git a/run_tests.sh b/run_tests.sh
index 4acef51..a1cad19 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,9 +1,17 @@
 #!/bin/zsh
 if [ $# -lt 2 ] ; then
-    echo "Usage: $0 cdrom mountpoint [tests]"
+    echo "Usage: $0 cdrom mountpoint [tests]">&2
     exit 1
 fi
 
+# support VNC=1 for automatically starting up vncviewer while running tests
+# if $VNCVIEWER isn't set try to figure out which one could be used
+if [ -z "$VNCVIEWER" ] ; then
+    for vncviewer in xvnc4viewer Xtightvnc x11vnc vncviewer; do
+        [[ -n ${commands[$vncviewer]} ]] && export VNCVIEWER=$vncviewer
+    done
+fi
+
 export CDROM="$1"
 export KERNEL=$(find "$2"/boot/ -name linux26)
 export INITRD=$(find "$2"/boot/ -name initrd.gz)
@@ -19,6 +27,7 @@ if [ -n "$1" ] ; then
 else
     TESTS=(*(/))
 fi
+
 for dir in $TESTS ; do
     [ ! -x $dir ] && continue
     cd $dir