r2778 - people/bmsleight/autotesting

[bmsleight-guest at alioth.debian.org]

Author: bmsleight-guest
Date: 2007-08-16 23:06:22 +0000 (Thu, 16 Aug 2007)
New Revision: 2778

Modified:
   people/bmsleight/autotesting/autotesting.sh
   people/bmsleight/autotesting/video-qemu-booting-iso.sh
Log:
Final changes for vncrec-twibright

Modified: people/bmsleight/autotesting/autotesting.sh
===================================================================
--- people/bmsleight/autotesting/autotesting.sh	2007-08-16 20:57:43 UTC (rev 2777)
+++ people/bmsleight/autotesting/autotesting.sh	2007-08-16 23:06:22 UTC (rev 2778)
@@ -3,36 +3,39 @@
 # Script to be run video-qemu-boot-iso.sh via cron job
 #
 
-while getopts v:q:t: opt
+while getopts p:v:q:t: opt
 do
     case "$opt" in
-      v)  VQBI="$OPTARG";;
+      p)  VQBI="$OPTARG";;
       q)  QEMU_BIN="$OPTARG";;
       t)  TIME_Q="$OPTARG";;
+      v)  VQUALITY="$OPTARG";;
 
+
       \?)		# unknown flag
       	  echo >&2 \
-		"usage: $0 [-v path to video-qemu-booting-iso.sh ] [-q alternative qemu binary name] [-t time to run qemu] logo.png /foo/bar/iso.directory/ /foo/bar/video.directory/ "
+		"usage: $0 [-p path to video-qemu-booting-iso.sh ] [-q alternative qemu binary name] [-t time to run qemu] /foo/bar/iso.directory/ /foo/bar/video.directory/ "
 	  exit 1;;
     esac
 done
 shift `expr $OPTIND - 1`
 
 if [ -z "$1" -a -z "$2" -a -z "$3" ]; then
-    echo "usage: $0 [-v path to video-qemu-booting-iso.sh ] [-q alternative qemu binary name] [-t time to run qemu]  logo.png /foo/bar/iso.directory/ /foo/bar/video.directory/ "
+    echo "usage: $0 [-p path to video-qemu-booting-iso.sh ] [-q alternative qemu binary name] [-t time to run qemu] [-v (0 to 10) encoding quality for video] /foo/bar/iso.directory/ /foo/bar/video.directory/ "
     echo
     echo " This script runs the video-qemu-booting-iso.sh for each iso in a directory. "
     echo
-    echo " This script will take _along_ time to run. Approx 2-3 hours per iso."
+    echo " This script will take _along_ time to run. Approx 1 hour per iso."
+    echo " Basically for time to run = number of isos x time to run qmeu x 3  seconds"
     echo " For testing the set-up use -t with a small value e.g. -t 10"
     echo
-    echo " The use of -q could allow qemu-ppc be used (Not _tested_)."
+    echo " The use of -q could allow qemu-ppc be used once Debian bug #388735 is resolved."
+
     exit
 fi
 
-LOGO=$1
-ISODIR=$2
-VIDEODIR=$3
+ISODIR=$1
+VIDEODIR=$2
 
 if [ "$VQBI" = "" ]; then
  VQBI="video-qemu-booting-iso.sh"
@@ -44,12 +47,15 @@
 if [ "$TIME_Q" = "" ]; then
  TIME_Q="1200"
 fi
+if [ "$VQUALITY" = "" ]; then
+ VQUALITY="5"
+fi
 
 for ISO in $ISODIR/*.iso
 do
  ISOBN=$(basename $ISO)
  VIDEO=$VIDEODIR$ISOBN.ogg
- echo "Running $VQBI -t $TIME_Q -l $LOGO -q $QEMU_BIN $ISO $VIDEO"
- $VQBI -t $TIME_Q -l $LOGO -q $QEMU_BIN $ISO $VIDEO
+ echo "Running $VQBI -t $TIME_Q -q $QEMU_BIN -v $VQUALITY $ISO $VIDEO"
+ $VQBI -t $TIME_Q -q $QEMU_BIN -v $VQUALITY $ISO $VIDEO
 done
 echo "Finished Autotesting"

Modified: people/bmsleight/autotesting/video-qemu-booting-iso.sh
===================================================================
--- people/bmsleight/autotesting/video-qemu-booting-iso.sh	2007-08-16 20:57:43 UTC (rev 2777)
+++ people/bmsleight/autotesting/video-qemu-booting-iso.sh	2007-08-16 23:06:22 UTC (rev 2778)
@@ -12,7 +12,7 @@
 #                                                         #
 # Required packages/applications :-                       #
 #  bash, expect, ffmpeg2thoera, imagemagick,              #
-#  twibright-vnc, qemu, vncserver                         #
+#  qemu, vncserver, vncrec-twibright                      #
 #                                                         #
 # Requires /etc/vnc.conf to be ammended.                  #
 #                                                         #
@@ -123,7 +123,7 @@
 {
 export DISPLAY=$VNSERVER_QEMU
 echo "Starting qemu, within Display $VNSERVER_QEMU"
-$QEMU_BIN -no-kqemu -full-screen  -cdrom $ISO -monitor telnet:$IPADDRESS:$QEMU_MONITOR_PORT,server,nowait &
+$QEMU_BIN -full-screen  -cdrom $ISO -monitor telnet:$IPADDRESS:$QEMU_MONITOR_PORT,server,nowait &
 sleep 3
 i=1
 REACHED_LAST_KB=""