Support VNC=1 to automatically start up a vnc viewer.

[grml-unittests.git] / run_tests.sh

diff --git a/run_tests.sh b/run_tests.sh
index 942adac..a1cad19 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,18 +1,35 @@
 #!/bin/zsh
-if [ $# -ne 2 ] ; then
-    echo Usage: $0 cdrom mountpoint
+if [ $# -lt 2 ] ; then
+    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)
 export CMDLINE_COMMON="$(awk '/append/ {  $1 = $2 = ""; print }' "$2/boot/isolinux/default.cfg")"
 
+shift
+shift
 
 export SERVER_STATUS="$PWD/webserver.py"
 export FRAMEWORK="$PWD/framework.sh"
-for dir in *(/) ; do
+if [ -n "$1" ] ; then
+    TESTS=$*
+else
+    TESTS=(*(/))
+fi
+
+for dir in $TESTS ; do
+    [ ! -x $dir ] && continue
     cd $dir
     ./runit.sh >/dev/null
     cd -