[Morphix-cvs] SF.net SVN: morphix: [2554] trunk/mmaker/utils/auto-testing

[<bms...@us...>]

Revision: 2554
          http://morphix.svn.sourceforge.net/morphix/?rev=2554&view=rev
Author:   bmsleight
Date:     2007-08-20 14:21:53 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
Adding support for AutoTesting .img builds

Modified Paths:
--------------
    trunk/mmaker/utils/auto-testing/run_testing.sh
    trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh

Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh	2007-08-15 20:51:53 UTC (rev 2553)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh	2007-08-20 21:21:53 UTC (rev 2554)
@@ -175,7 +175,7 @@
       echo $DIVIDER
       sudo isomorph --list $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN
       echo $DIVIDER
-      /home/morph/morphix/trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh -q qemu_0.8.4-etch1 -t 800 -l /home/morph/morphix/trunk/cdrom-misc/images/Morphix_TINY.gif -g 1024x768 -s "spc,s,p,l,a,s,h,equal,n,spc,d,e,b,u,g,m,o,r,p,h,i,x,equal,y,e,s,spc,kp_enter" $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.ogg 
+      /home/morph/morphix/trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh -q qemu_0.8.4-etch1 -t 800 -g 1024x768 -s "spc,s,p,l,a,s,h,equal,n,spc,d,e,b,u,g,m,o,r,p,h,i,x,equal,y,e,s,spc,kp_enter" $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.ogg 
 # sudo /home/morph/morphix/trunk/mmaker/utils/auto-testing/auto_testing.sh $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.avi  800
       sudo rm $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN
       echo $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN

Modified: trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh	2007-08-15 20:51:53 UTC (rev 2553)
+++ trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh	2007-08-20 21:21:53 UTC (rev 2554)
@@ -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,14 @@
 {
 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 &
+IMAGE_TYPE=$(echo "$ISO" | sed -e 's/.*[.]//g')
+if [ "$IMAGE_TYPE" = "img" ]
+then
+  QEMU_OPTS="-hda"
+else
+  QEMU_OPTS="-cdrom"
+fi
+$QEMU_BIN -full-screen $QEMU_OPTS $ISO -monitor telnet:$IPADDRESS:$QEMU_MONITOR_PORT,server,nowait &
 sleep 3
 i=1
 REACHED_LAST_KB=""
@@ -203,8 +210,8 @@
     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 " For every second of running qemu the script it can take up to 3s to compile the video."
+    echo " For example using -t 1200 will about one hour."
     echo
     echo " Minimum geometry for qemu -g 1024x768"
     echo


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.