r2655 - people/bmsleight/autotesting

daniel at alioth.debian.org daniel at alioth.debian.org
Mon Jul 30 21:52:59 UTC 2007


Author: daniel
Date: 2007-07-30 21:52:59 +0000 (Mon, 30 Jul 2007)
New Revision: 2655

Modified:
   people/bmsleight/autotesting/autotesting.sh
   people/bmsleight/autotesting/video-qemu-booting-iso.sh
Log:
Removed EOL whitespaces.

Modified: people/bmsleight/autotesting/autotesting.sh
===================================================================
--- people/bmsleight/autotesting/autotesting.sh	2007-07-30 21:43:11 UTC (rev 2654)
+++ people/bmsleight/autotesting/autotesting.sh	2007-07-30 21:52:59 UTC (rev 2655)
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Script to be run video-qemu-boot-iso.sh via cron job 
+# Script to be run video-qemu-boot-iso.sh via cron job
 #
 
 while getopts v:q:t: opt
@@ -12,17 +12,17 @@
 
       \?)		# 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 [-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/ "
 	  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 [-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
     echo " This script runs the video-qemu-booting-iso.sh for each iso in a directory. "
-    echo 
+    echo
     echo " This script will take _along_ time to run. Approx 2-3 hours per iso."
     echo " For testing the set-up use -t with a small value e.g. -t 10"
     echo

Modified: people/bmsleight/autotesting/video-qemu-booting-iso.sh
===================================================================
--- people/bmsleight/autotesting/video-qemu-booting-iso.sh	2007-07-30 21:43:11 UTC (rev 2654)
+++ people/bmsleight/autotesting/video-qemu-booting-iso.sh	2007-07-30 21:52:59 UTC (rev 2655)
@@ -3,7 +3,7 @@
 # video-qemu-booting-iso.sh                               #
 #                                                         #
 # Copyleft (c) 2007 Brendan M. Sleight                    #
-#              <bmsleight at barwap._REMOVE_SPAM_TRAP.com>   # 
+#              <bmsleight at barwap._REMOVE_SPAM_TRAP.com>   #
 #                                                         #
 # This script is licensed under the GNU GPL v2 or later.  #
 #                                                         #
@@ -11,7 +11,7 @@
 # /usr/share/common-licenses/GPL                          #
 #                                                         #
 # Required packages/applications :-                       #
-#  bash, expect, ffmpeg2thoera, imagemagick, mencoder,    # 
+#  bash, expect, ffmpeg2thoera, imagemagick, mencoder,    #
 #  qemu, vncrec, vncserver                                #
 #                                                         #
 # Requires /etc/vnc.conf to be ammended.                  #
@@ -30,7 +30,7 @@
 if [ "$VNCCONF" != "\$vncStartup = \"~/.vnc/xstartup\";" ]
  then
   echo "Requires vnc.conf to have the line:-  "
-  echo "\$vncStartup = \"~/.vnc/xstartup\";" 
+  echo "\$vncStartup = \"~/.vnc/xstartup\";"
   echo "Else two lots of windowm mangers will launched in the extra vnc sessions."
   exit
 fi
@@ -42,7 +42,7 @@
 PASSWD="$RANDOM.$RANDOM.$RANDOM.$RANDOM.$RANDOM"
 HOSTNAME=$(hostname)
 OLD_DISPLAY="$DISPLAY"
-TODAY=$(date +"%F")  
+TODAY=$(date +"%F")
 TMP_DIR=/tmp/vqbi.$$.tmp
 IPADDRESS="127.0.0.1"
 VNCREC_MOVIE_FRAMERATE=1
@@ -116,7 +116,7 @@
 
 start_vnc_record ()
 {
-export DISPLAY="$VNSERVER_VNCREC"	
+export DISPLAY="$VNSERVER_VNCREC"
 export VNCREC_MOVIE_FRAMERATE
 echo "Starting vncrec, recording :$VNCSERVER_QMEU_NUMBER. Local display :$VNCSERVER_VNCREC_NUMBER"
 vncrec -display :$VNCSERVER_VNCREC_NUMBER -passwd ~/.vnc/passwd -shared -viewonly -encoding raw -record $TMP_DIR/qemu.1.vnc :$VNCSERVER_QMEU_NUMBER &
@@ -146,20 +146,20 @@
 
 let_qemu_run ()
 {
-echo "Sleeping for $TIME_Q seconds whilst qemu runs"  
+echo "Sleeping for $TIME_Q seconds whilst qemu runs"
 sleep $TIME_Q
 }
 
 stop_qemu ()
 {
-echo "Stopping vncrec and qemu"  
+echo "Stopping vncrec and qemu"
 killall vncrec
 killall $QEMU_BIN
 }
 
 stop_vncservers ()
 {
-echo "Stopping vncservers"  
+echo "Stopping vncservers"
 vncserver -kill :$VNCSERVER_QMEU_NUMBER
 vncserver -kill :$VNCSERVER_VNCREC_NUMBER
 }
@@ -174,7 +174,7 @@
 vncrec  -movie $TMP_DIR/qemu.1.vnc
 for i in $TMP_DIR/image-*.jpg
 do
- convert $i -resize $CONVERT_DIM $i 
+ convert $i -resize $CONVERT_DIM $i
  echo "Resized $i"
  # The logo is needed to ensure we do not have a blank frame, which mencode can not handle.
  # Heck - it also looks nice IMHO.
@@ -189,7 +189,7 @@
 ##Following is ideal - does not work
 #mkfifo -m 660 $TMP_DIR/stream.yuv
 #mplayer -vo yuv4mpeg:file=$TMP_DIR/stream.yuv -ao null -nosound -quiet "mf://$TMP_DIR/*.jpg"  -mf fps=4:type=jpg &
-#ffmpeg2theora -v 8 $TMP_DIR/stream.yuv -o $VIDEO 
+#ffmpeg2theora -v 8 $TMP_DIR/stream.yuv -o $VIDEO
 #sleep 5
 
 mencoder mf://"$TMP_DIR/*.jpg" -mf w=800:h=600:fps=4:type=jpg -ovc lavc -lavcopts vcodec=mpeg4:mbd=2:trell -oac copy -o $TMP_DIR/tmp.avi
@@ -201,7 +201,7 @@
 DISPLAY="$OLD_DISPLAY"
 export DISPLAY="$OLD_DISPLAY"
 rm $TMP_DIR -r
-rm /tmp/video-qemu-booting-iso.lock 
+rm /tmp/video-qemu-booting-iso.lock
 }
 
 
@@ -216,10 +216,10 @@
       l)  LOGO="$OPTARG";;
       q)  QEMU_BIN="$OPTARG";;
 
-      
+
       \?)		# unknown flag
       	  echo >&2 \
-		"usage: $0 [-s \"keys,to,send,to,qemu\"] [-p port_number for qemu-monitor] [-g geometry of vncsession] [-d dimensions of video] [-t time to run qemu] [-l logo] [-q alternative qemu binary name] IsoToTest.iso Video.ogg " 
+		"usage: $0 [-s \"keys,to,send,to,qemu\"] [-p port_number for qemu-monitor] [-g geometry of vncsession] [-d dimensions of video] [-t time to run qemu] [-l logo] [-q alternative qemu binary name] IsoToTest.iso Video.ogg "
 	  exit 1;;
     esac
 done
@@ -229,14 +229,14 @@
     echo "usage: $0 [-s \"keys,to,send,to,qemu\"] [-p port_number for qemu-monitor] [-g geometry of vncsession] [-d dimensions of video] [-t time to run qemu] [-l logo] IsoToTest.iso Video.ogg " 
     echo
     echo " This script boots a livecd using qemu and records a video of the process. "
-    echo 
+    echo
     echo " It is worth noting that this script takes a long time to run and heavy usage of CPU."
     echo " There is heavy usage of the qemu, imagemagik tools. "
     echo " For every second of running qemu the script it can take up to 12s to compile the video."
     echo " For example using -t 300 will about one hour."
     echo
     echo " Minimum geometry for qemu -g 1024x768"
-    echo 
+    echo
     echo " Launches a couple of vncserver session, kills other vncrec and qemu sessions running."
     exit
 fi




More information about the debian-live-changes mailing list