From: <bms...@us...> - 2006-05-10 21:39:49
|
Revision: 2219 Author: bmsleight Date: 2006-05-10 14:39:43 -0700 (Wed, 10 May 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2219&view=rev Log Message: ----------- Minor autotesting updates - better commit incase hardware fails Modified Paths: -------------- trunk/mmaker/utils/auto-testing/AutoTestingMini.xml trunk/mmaker/utils/auto-testing/auto_testing.sh trunk/mmaker/utils/auto-testing/run_testing.sh Modified: trunk/mmaker/utils/auto-testing/AutoTestingMini.xml =================================================================== --- trunk/mmaker/utils/auto-testing/AutoTestingMini.xml 2006-05-10 06:22:06 UTC (rev 2218) +++ trunk/mmaker/utils/auto-testing/AutoTestingMini.xml 2006-05-10 21:39:43 UTC (rev 2219) @@ -1,10 +1,11 @@ <comps> <group> <minimod> - <version>0.0.1</version> + <version>0.0.2</version> <description>MorphMini AutoTesting</description> <minitag>AutoTesting</minitag> - <maintag>ALL</maintag> + <maintag>ALL</maintag> + <bootoption>ALL</bootoption> <!-- Only run the minimodule when this bootoption is used. Special case run ALL the time--> <filelist> <!-- files to be added to minimod available as $1/morphix/files/ --> <local> <file>/home/morph/morphix/trunk/mmaker/utils/auto-testing/cat_file.sh</file> Modified: trunk/mmaker/utils/auto-testing/auto_testing.sh =================================================================== --- trunk/mmaker/utils/auto-testing/auto_testing.sh 2006-05-10 06:22:06 UTC (rev 2218) +++ trunk/mmaker/utils/auto-testing/auto_testing.sh 2006-05-10 21:39:43 UTC (rev 2219) @@ -62,9 +62,8 @@ while [ $l -lt $FRAMES ] do convert=$DUMPS$l'.miff' - convertpng=$DUMPS$l'.miff.png' - echo "Converting $convert -> $convertpng" - convert $convert -resize 640x480 png32:$convertpng + echo "Converting $convert -> $convert.jpg" + convert $convert -resize 800x600 $convert.jpg rm $convert l=$(expr $l + 1) done @@ -72,14 +71,23 @@ # Create the intro to the video title="Autotesting using Qemu" text=" $ISO \n \n The iso has been ammended to help debugging \n Added the bootoptions splash=n debugmorphix=y \n Also added a mini-module Morphix-Mini-Debug-Auto-Testing.mod \n This mini-module prints out debug information to the screen \n of course the iso does not normally contain this minimodule \n or display this information. \n \n $COMMENTS" -convert -size 600x440 xc:white -pointsize 25 -fill darkblue -annotate 0x0+250+75 "$title" -pointsize 16 -fill blue -annotate 0x0+50+200 "$text" -append $LOGO -bordercolor darkblue -border 20x20 -flatten png32:"$DUMPS"0.png +convert -size 600x440 xc:white -pointsize 25 -fill darkblue -annotate 0x0+250+75 "$title" -pointsize 16 -fill blue -annotate 0x0+50+200 "$text" -append $LOGO -bordercolor darkblue -border 20x20 -flatten "$DUMPS"0.jpg l=1 +while [ $l -lt 9 ] +do + convert=$DUMPS'0'$l'.miff.jpg' + cp "$DUMPS"0.jpg $convert + l=$(expr $l + 1) +done +l=10 while [ $l -lt 16 ] do - convert=$DUMPS$l'.miff.png' - cp "$DUMPS"0.png $convert + convert=$DUMPS$l'.miff.jpg' + cp "$DUMPS"0.jpg $convert l=$(expr $l + 1) done -ffmpeg -b 400 -y -r 4 -i $DUMPS'%d.miff.png' -s 800x600 $VIDEO +mencoder mf://$TMP_D*.jpg -mf w=800:h=600:fps=4:type=jpg -ovc lavc -lavcopts vcodec=mpeg4:mbd=2:trell -oac copy -o $VIDEO +ffmpeg2theora $VIDEO +rm $VIDEO rm $TMP_D -r Modified: trunk/mmaker/utils/auto-testing/run_testing.sh =================================================================== --- trunk/mmaker/utils/auto-testing/run_testing.sh 2006-05-10 06:22:06 UTC (rev 2218) +++ trunk/mmaker/utils/auto-testing/run_testing.sh 2006-05-10 21:39:43 UTC (rev 2219) @@ -94,7 +94,7 @@ sudo morphmini /home/morph/morphix/trunk/mmaker/utils/auto-testing/AutoTestingMini.xml $DEBUG_MINI TODAY=$(date +"%F") -MAINMODS=$(find /home/morph/autobuilds/mainmod/ /home/morph/alextreme/mainmod/ /home/morph/local_autobuilds/builds/ -type f -name "*$TODAY*.mod" ) +MAINMODS=$(find /home/morph/autobuilds/mainmod/ /home/morph/alextreme/mainmod/ /home/morph/local_autobuilds/builds/mainmod/ -type f -name "*$TODAY*.mod" ) BASES=$(find /home/morph/autobuilds/base/ -type f -name "*$TODAY*.iso" ) echo $TODAY echo $DIVIDER @@ -122,20 +122,20 @@ elif [[ $MAINMODS_MD5SUM != $MAINMODS_MD5SUM_REAL ]] then echo "md5sum's not equal - will not make video until mainmods are completely d/loaded" - elif [ -e $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.avi ] + elif [ -e $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.ogg ] then - echo $TMP_MAINMODS_BN'_'$TMP_BASES_BN.avi' file exists skipping this video' + echo $TMP_MAINMODS_BN'_'$TMP_BASES_BN.ogg' file exists skipping this video' else - echo $DIVIDER - echo "Add to base, mini and main modules" - echo $TITLED + echo $DIVIDER + echo "Add to base, mini and main modules" + echo $TITLED sudo isomorph --add mini $DEBUG_MINI $TMP_BASES $TMP_ISO_1 sudo isomorph --add main $TMP_MAINMODS $TMP_ISO_1 $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN rm $TMP_ISO_1 echo $DIVIDER echo "Run auto_testing" echo $TITLED - 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 600 + 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 650 sudo rm $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN echo $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN gzip -c $LOG_FILE >$VID_DIR/$LOG_FILE_BN'_'$TODAY'_.gz' @@ -143,7 +143,7 @@ echo "Upload" echo $TITLED rsync -avz --delete -e ssh $VID_DIR mo...@lo...:morphixorg/autobuilds/video/ - cp $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.avi /home/morph/autobuilds/video/ + cp $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.ogg /home/morph/autobuilds/video/ # This machine get hot - have 20 minutes to cool down sleep 1200 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |