Menu
▾
▴
morphix-cvs
|
From: <bms...@us...> - 2006-03-29 21:14:50
|
Revision: 2183 Author: bmsleight Date: 2006-03-29 13:14:41 -0800 (Wed, 29 Mar 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2183&view=rev Log Message: ----------- Tweaking autotesting and AutoTestingMini.xml. May I have a morphing-morphmini.deb please (line 72) ? (Still catching alex's cia stats) Modified Paths: -------------- trunk/mmaker/utils/auto-testing/AutoTestingMini.xml trunk/mmaker/utils/auto-testing/run_testing.sh Modified: trunk/mmaker/utils/auto-testing/AutoTestingMini.xml =================================================================== --- trunk/mmaker/utils/auto-testing/AutoTestingMini.xml 2006-03-29 20:53:47 UTC (rev 2182) +++ trunk/mmaker/utils/auto-testing/AutoTestingMini.xml 2006-03-29 21:14:41 UTC (rev 2183) @@ -6,7 +6,9 @@ <minitag>AutoTesting</minitag> <maintag>ALL</maintag> <filelist> <!-- files to be added to minimod available as $1/morphix/files/ --> - <file>/home/morph/morphix/trunk/mmaker/utils/auto-testing/cat_file.sh</file> + <local> + <file>/home/morph/morphix/trunk/mmaker/utils/auto-testing/cat_file.sh</file> + </local> </filelist> <commandlist> <!-- Commands to be started from minimodule --> <preX> <!-- Commands to run before X windows start --> Modified: trunk/mmaker/utils/auto-testing/run_testing.sh =================================================================== --- trunk/mmaker/utils/auto-testing/run_testing.sh 2006-03-29 20:53:47 UTC (rev 2182) +++ trunk/mmaker/utils/auto-testing/run_testing.sh 2006-03-29 21:14:41 UTC (rev 2183) @@ -40,7 +40,7 @@ #Get Autobuilds from alextreme.org STORE_AT_MM="/home/morph/alextreme/mainmod" -REMOTE_AT_MM="http://www.alextreme.org/autobuilds" +REMOTE_AT_MM="http://www.alextreme.org/autobuilds/" GNOME_NAME="morphix-gnome-" KDE_NAME="morphix-kde-" @@ -49,8 +49,8 @@ wget_cl() { wget --tries=3 --timeout=60 --directory-prefix=$1 $2 } -wget_cl "$STORE_AT_MM" "$REMOTE_AT_MM/index.html" -if [ -e $REMOTE_AT_MM/index.html ] +wget_cl "$STORE_AT_MM" "$REMOTE_AT_MM/" +if [ -e $STORE_AT_MM/index.html ] then TODAY=$(date +"%F") GNOME=$( grep $STORE_AT_MM/index.html -e $GNOME_NAME$TODAY | sed -e s/^.*\<a\ href=\"//g | sed -e s/\"\>.*$//g | grep -e "mod$") @@ -72,7 +72,7 @@ #Build minimod #/home/morph/morphix/trunk/mmaker/utils/auto-testing/build_auto_test_mini.sh #morphmini /home/morph/morphix/trunk/mmaker/utils/auto-testing/AutoTestingMini.xml $DEBUG_MINI -sudo /home/morph/morphix/trunk/morph-scripts/morphmini/morphimini /home/morph/morphix/trunk/mmaker/utils/auto-testing/AutoTestingMini.xml $DEBUG_MINI +sudo morphimini /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" ) @@ -107,7 +107,7 @@ 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 - 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 + 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 540 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' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bms...@us...> - 2006-04-03 19:05:39
|
Revision: 2196 Author: bmsleight Date: 2006-04-03 12:05:32 -0700 (Mon, 03 Apr 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2196&view=rev Log Message: ----------- --dry-run is only needed when testing a scipt. Doh\! Modified Paths: -------------- trunk/mmaker/utils/auto-testing/AutoTestingMini.xml trunk/mmaker/utils/auto-testing/cat_file.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-04-03 18:20:17 UTC (rev 2195) +++ trunk/mmaker/utils/auto-testing/AutoTestingMini.xml 2006-04-03 19:05:32 UTC (rev 2196) @@ -15,8 +15,9 @@ <command>echo " * Using AutoTesting Mini Module"</command> </preX> <X> <!-- Commands to run in X windows --> + <command>xset s reset </command> <!-- Reset screensaver if on --> + <command>xset s off </command> <!--- Screensaver off --> <command>firefox http://www.google.com & </command> -<!-- <command>sleep 60</command> --> <!-- As xmessage runs and terminates quickly, wait until x is settled until running next command --> <command>/bin/bash $1/morphix/files/cat_file.sh</command> </X> <postX> <!-- Commands to run after X windows shutdown --> Modified: trunk/mmaker/utils/auto-testing/cat_file.sh =================================================================== --- trunk/mmaker/utils/auto-testing/cat_file.sh 2006-04-03 18:20:17 UTC (rev 2195) +++ trunk/mmaker/utils/auto-testing/cat_file.sh 2006-04-03 19:05:32 UTC (rev 2196) @@ -8,7 +8,7 @@ TITLEH="AUTO-TESTING DEBUG INFORMATION" TITLED="------------------------------------------------------- " TITLEF="FINISHED DEBUG IFORMATION" -SLEEPS=8 +SLEEPS=12 DIS_LINES=40 mkdir /tmp/debug Modified: trunk/mmaker/utils/auto-testing/run_testing.sh =================================================================== --- trunk/mmaker/utils/auto-testing/run_testing.sh 2006-04-03 18:20:17 UTC (rev 2195) +++ trunk/mmaker/utils/auto-testing/run_testing.sh 2006-04-03 19:05:32 UTC (rev 2196) @@ -44,9 +44,9 @@ find /home/morph/autobuilds/mainmod/sarge/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f find /home/morph/autobuilds/mainmod/sid/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f find /home/morph/autobuilds/base/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f -rsync --dry-run -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/ -rsync --dry-run -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/ -rsync --dry-run -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/ +rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/ +rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/ +rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/ find /home/morph/videos/ -not -type d -mtime +4 -print0 | xargs --null --no-run-if-empty sudo rm -f @@ -63,7 +63,7 @@ find $STORE_AT_MM/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f rm $STORE_AT_MM/index.html* 1>/dev/null 2>&1 wget_cl() { - wget --non-verbose --tries=3 --timeout=60 --directory-prefix=$1 $2 + wget --no-verbose --tries=3 --timeout=60 --directory-prefix=$1 $2 } wget_cl "$STORE_AT_MM" "$REMOTE_AT_MM/" if [ -e $STORE_AT_MM/index.html ] @@ -135,7 +135,7 @@ 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 540 + 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 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' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bms...@us...> - 2006-06-26 21:30:45
|
Revision: 2327 Author: bmsleight Date: 2006-06-26 14:30:36 -0700 (Mon, 26 Jun 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2327&view=rev Log Message: ----------- videos go away Modified Paths: -------------- trunk/mmaker/utils/auto-testing/cat_file.sh trunk/mmaker/utils/auto-testing/run_testing.sh Modified: trunk/mmaker/utils/auto-testing/cat_file.sh =================================================================== --- trunk/mmaker/utils/auto-testing/cat_file.sh 2006-06-26 19:51:11 UTC (rev 2326) +++ trunk/mmaker/utils/auto-testing/cat_file.sh 2006-06-26 21:30:36 UTC (rev 2327) @@ -61,6 +61,11 @@ echo $DIVIDER >>$TMP_CAT_FILES ls /morphix -R >>$TMP_CAT_FILES echo >>$TMP_CAT_FILES +echo $DIVIDER >>$TMP_CAT_FILES +echo "cat /home/$USER/.??*" >>$TMP_CAT_FILES +echo $DIVIDER >>$TMP_CAT_FILES +cat /home/$USER/.??* >>$TMP_CAT_FILES +echo >>$TMP_CAT_FILES wc -l $TMP_CAT_FILES | cut -d\ -f 1 >/tmp/debug/wc.txt LINES=$(cat /tmp/debug/wc.txt) Modified: trunk/mmaker/utils/auto-testing/run_testing.sh =================================================================== --- trunk/mmaker/utils/auto-testing/run_testing.sh 2006-06-26 19:51:11 UTC (rev 2326) +++ trunk/mmaker/utils/auto-testing/run_testing.sh 2006-06-26 21:30:36 UTC (rev 2327) @@ -48,6 +48,7 @@ find /home/morph/autobuilds/base/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f find /home/morph/autobuilds/minimod/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f find /home/morph/videos/ -not -type d -mtime +4 -print0 | xargs --null --no-run-if-empty sudo rm -f +find /home/morph/autobuilds/video/ -not -type d -mtime +4 -print0 | xargs --null --no-run-if-empty sudo rm -f if [ -z "$SKIP_DOWNLOADS" ]; then @@ -153,7 +154,7 @@ echo "Run auto_testing" echo $TITLED date - 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 /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 700 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' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bms...@us...> - 2007-02-22 14:44:00
|
Revision: 2461
http://svn.sourceforge.net/morphix/?rev=2461&view=rev
Author: bmsleight
Date: 2007-02-22 06:42:28 -0800 (Thu, 22 Feb 2007)
Log Message:
-----------
Bigger logo
Modified Paths:
--------------
trunk/mmaker/utils/auto-testing/auto_testing.sh
trunk/mmaker/utils/auto-testing/run_testing.sh
Modified: trunk/mmaker/utils/auto-testing/auto_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/auto_testing.sh 2007-02-21 23:21:18 UTC (rev 2460)
+++ trunk/mmaker/utils/auto-testing/auto_testing.sh 2007-02-22 14:42:28 UTC (rev 2461)
@@ -70,7 +70,7 @@
# This ensures that there is no completely back jpg with no info
# as mencode seg fautls if a jpg is completly empty
# Hey - it also looks pretty :)
-convert $MINILOGO -negate -gravity South -background Black -font Helvetica-Bold -fill white -splice 0x14 -draw "text 0,0 'AutoTesting'" -transparent black $TMP_D/minilogo.gif
+convert $MINILOGO -resize 200x200 -negate -gravity South -background Black -font Helvetica-Bold -fill white -splice 0x36 -pointsize 35 -draw "text 0,0 'AutoTesting'" -transparent black $TMP_D/minilogo.gif
convert $TMP_D/minilogo.gif -fill grey50 -colorize 40 $TMP_D/minilogo.gif
l=16
while [ $l -lt $FRAMES ]
Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh 2007-02-21 23:21:18 UTC (rev 2460)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh 2007-02-22 14:42:28 UTC (rev 2461)
@@ -21,7 +21,8 @@
# 7 - Relax until the next day
SKIP_DOWNLOADS="$1"
-DEBUG_MINI=/home/morph/minimods/Morphix-Mini-Debug-Auto-Testing.mod
+TODAY=$(date +"%F")
+DEBUG_MINI=/home/morph/autobuilds/minimod/Morphix-Mini-Debug-Auto-Testing.$TODAY.mod
TMP_ISO_DIR=/tmp/iso
TMP_TAR_DIR=/tmp/iso/tar/
TMP_ISO_1=$TMP_ISO_DIR/tmp1.iso
@@ -46,7 +47,6 @@
echo "Getting AutoBuilds from Morphix.org"
echo $TITLED
date
-TODAY=$(date +"%F")
find /home/morph/autobuilds/mainmod/sarge/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
find /home/morph/autobuilds/mainmod/sid/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
find /home/morph/autobuilds/base/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-14 22:31:29
|
Revision: 2534
http://svn.sourceforge.net/morphix/?rev=2534&view=rev
Author: bmsleight
Date: 2007-07-14 15:31:25 -0700 (Sat, 14 Jul 2007)
Log Message:
-----------
vncrec is much neater, frame capured every second - by tracking only the changes in frame buffer of vnc session, rather than whole screenshot. Hopefully HD will last longer.
Modified Paths:
--------------
trunk/mmaker/utils/auto-testing/Required-Packages.txt
trunk/mmaker/utils/auto-testing/auto_testing.sh
trunk/mmaker/utils/auto-testing/run_testing.sh
Modified: trunk/mmaker/utils/auto-testing/Required-Packages.txt
===================================================================
--- trunk/mmaker/utils/auto-testing/Required-Packages.txt 2007-07-12 21:11:58 UTC (rev 2533)
+++ trunk/mmaker/utils/auto-testing/Required-Packages.txt 2007-07-14 22:31:25 UTC (rev 2534)
@@ -12,6 +12,8 @@
build-essential
debhelper
+vncrec - from source
+
Desired=Unknown/Install/Remove/Purge/Hold
| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed
|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)
Modified: trunk/mmaker/utils/auto-testing/auto_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/auto_testing.sh 2007-07-12 21:11:58 UTC (rev 2533)
+++ trunk/mmaker/utils/auto-testing/auto_testing.sh 2007-07-14 22:31:25 UTC (rev 2534)
@@ -42,35 +42,14 @@
isomorph --add boot "splash=n debugmorphix=yes" $ISO $TMP_D/qemu.iso
qemu -vnc :1 -no-kqemu -full-screen -pidfile $TMP_D/qemu.pid -cdrom $TMP_D/qemu.iso &
sleep 2
-vncviewer -encodings raw -fullscreen -viewonly 127.0.0.1:1 &
-#vncviewer -fullscreen -viewonly 127.0.0.1:1 &
+VNCREC_MOVIE_FRAMERATE=1
+export VNCREC_MOVIE_FRAMERATE
+vncrec -geometry 800x600 -record /tmp/qemu.1.vnc :1 &
+sleep 10
+killall vncrec
+vncrec -fullscreen -record /tmp/qemu.2.vnc :1 &
+sleep $FRAMES
-l=16
-#xwininfo -root | grep wininfo | cut -d' ' -f 4 >$TMP_D/xwid
-#rootwindow=$(cat $TMP_D/xwid)
-while [ $l -lt $FRAMES ]
-do
- if [ "$l" -lt "10" ]
- then
- convert=$DUMPS'00'$l'.miff'
- elif [ "$l" -lt "100" ]
- then
- convert=$DUMPS'0'$l'.miff'
- if [ "$l" -eq "22" ]
- then
- echo "hi"
- killall vncviewer
- vncviewer -encodings raw -fullscreen -viewonly 127.0.0.1:1 &
- fi
- else
- convert=$DUMPS$l'.miff'
- fi
- import -display :0 -window root $convert
-# sleep 0.5
- l=$(expr $l + 1)
- echo "Frame " $convert " at " $(date +"%F_%H:%M:%S.%N")
-done
-
kill_pid=$(cat $TMP_D/qemu.pid)
kill $kill_pid
rm $TMP_D/qemu.iso
@@ -82,32 +61,53 @@
# Hey - it also looks pretty :)
convert $MINILOGO -resize 200x200 -negate -gravity South -background Black -font Helvetica-Bold -fill white -splice 0x36 -pointsize 35 -draw "text 0,0 'AutoTesting'" -transparent black $TMP_D/minilogo.gif
convert $TMP_D/minilogo.gif -fill grey50 -colorize 40 $TMP_D/minilogo.gif
+
+VNCREC_MOVIE_CMD="convert xpm:- /tmp/dump/image-%05d.png"
+export VNCREC_MOVIE_CMD
+vncrec -movie /tmp/qemu.1.vnc
l=16
-while [ $l -lt $FRAMES ]
+for i in $(ls /tmp/dump/image-*.png);
do
- if [ "$l" -lt "10" ]
- then
- convert=$DUMPS'00'$l'.miff'
- elif [ "$l" -lt "100" ]
- then
- convert=$DUMPS'0'$l'.miff'
- else
- convert=$DUMPS$l'.miff'
- fi
-
- echo "Converting $convert -> $convert.jpg"
-# convert $convert -resize 800x600 $convert.jpg
-#
- convert $convert -resize 800x600 $convert.jpg
+ if [ "$l" -lt "10" ]
+ then
+ convert=$DUMPS'00'$l'.miff'
+ elif [ "$l" -lt "100" ]
+ then
+ convert=$DUMPS'0'$l'.miff'
+ else
+ convert=$DUMPS$l'.miff'
+ fi
+ let l=l+1
+ echo $i "->" $convert
+ convert $i -resize 800x600 $convert.jpg
composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif $convert.jpg $convert.jpg
- rm $convert
- l=$(expr $l + 1)
done
+rm /tmp/dump/image-*
+vncrec -movie /tmp/qemu.2.vnc 1>/dev/null
+for i in $(ls /tmp/dump/image-*.png);
+do
+ if [ "$l" -lt "10" ]
+ then
+ convert=$DUMPS'00'$l'.miff'
+ elif [ "$l" -lt "100" ]
+ then
+ convert=$DUMPS'0'$l'.miff'
+ else
+ convert=$DUMPS$l'.miff'
+ fi
+ let l=l+1
+ echo $i "->" $convert
+ convert $i -resize 800x600 $convert.jpg
+ composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif $convert.jpg $convert.jpg
+done
+rm /tmp/dump/image-*
+
+
# Create the intro to the video
title="Autotesting using Qemu"
text=" $ISO - The iso has been amended to help debugging. The boot-options splash=n debugmorphix=y have been added and a MiniModule Morphix-Mini-Debug-Auto-Testing.mod added. This MiniModule prints out debug information to the screen, the iso does not normally contain this MiniModule or display this information. \n $LIST_ISOMORPH \n \n $COMMENTS"
-FOLD_TEXT==$(echo "$text" | fold -s -w 100 )
+FOLD_TEXT=$(echo "$text" | fold -s -w 100 )
convert -size 600x440 xc:white -pointsize 25 -fill darkblue -annotate 0x0+250+75 "$title" -pointsize 10 -fill blue -annotate 0x0+50+200 "$FOLD_TEXT" -append $LOGO -bordercolor darkblue -border 20x20 -flatten "$DUMPS"0.jpg
convert "$DUMPS"0.jpg -resize 800x600 "$DUMPS"1.jpg
mv "$DUMPS"1.jpg "$DUMPS"0.jpg
@@ -131,3 +131,5 @@
ffmpeg2theora $VIDEO --artist "AutoTesting" --title "$VIDEO $COMMENTS" --organization "www.morphix.org" --copyright "copyleft" --date "$TODAY"
rm $VIDEO
rm $TMP_D -r
+rm /tmp/qemu.2.vnc
+rm /tmp/qemu.1.vnc
Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh 2007-07-12 21:11:58 UTC (rev 2533)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh 2007-07-14 22:31:25 UTC (rev 2534)
@@ -174,7 +174,7 @@
echo $DIVIDER
sudo isomorph --list $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN
echo $DIVIDER
- 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 700
+ 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
gzip -c $LOG_FILE >$VID_DIR/$LOG_FILE_BN'_'$TODAY'_.gz'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-28 07:22:30
|
Revision: 2543
http://morphix.svn.sourceforge.net/morphix/?rev=2543&view=rev
Author: bmsleight
Date: 2007-07-28 00:22:24 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
Working in progress
Added Paths:
-----------
trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh
Removed Paths:
-------------
trunk/mmaker/utils/auto-testing/auto_testing.webconverger.sh
Deleted: trunk/mmaker/utils/auto-testing/auto_testing.webconverger.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/auto_testing.webconverger.sh 2007-07-16 21:41:27 UTC (rev 2542)
+++ trunk/mmaker/utils/auto-testing/auto_testing.webconverger.sh 2007-07-28 07:22:24 UTC (rev 2543)
@@ -1,128 +0,0 @@
-#!/bin/bash
-#
-# Copyleft (c) 2006 Brendan M. Sleight #
-# <bmsleight@barwap._REMOVE_SPAM_TRAP.com> #
-# #
-# This script is licensed under the GNU GPL v2 or later. #
-# #
-# On Debian systems, this license can be obtained via #
-# /usr/share/common-licenses/GPL #
-#
-LOGO=/home/morph/images/webconverger.jpg
-MINILOGO=/home/morph/images/webconverger.jpg
-TODAY=$(date +"%F")
-ISO=$1
-VIDEO=$2
-COMMENTS=$4
-if [ -z "$ISO" -a -z "$VIDEO" ]; then
- echo "Usage: $0 ISO output.avi [Num capture frames] [comments]"
- echo
- echo "e.g. $0 Morphing-Morphix.iso Morphing-Morphix.avi "
- echo "e.g. $0 Morphing-Morphix.iso Morphing-Morphix.avi 800 "
- echo "e.g. $0 Morphing-Morphix.iso Morphing-Morphix.avi 1000 \"D/load on 2006-01-01\" "
- echo
- echo "This script tests a Webconverger ISO using qemu "
- echo " and then generates a video"
- echo
- exit
-fi
-
-if [ -z "$3" ]; then
- FRAMES=480
- else
- FRAMES=$(expr $3 + 16)
-fi
-
-TMP_D=/tmp/dump/
-DUMPS=$TMP_D/dump
-mkdir $TMP_D 2>/dev/null
-
-qemu -vnc :1 -no-kqemu -full-screen -pidfile $TMP_D/qemu.pid -cdrom $ISO &
-sleep 2
-vncviewer -encodings raw -fullscreen -viewonly 127.0.0.1:1 &
-l=16
-while [ $l -lt $FRAMES ]
-do
- if [ "$l" -lt "10" ]
- then
- convert=$DUMPS'00'$l'.miff'
- elif [ "$l" -lt "100" ]
- then
- convert=$DUMPS'0'$l'.miff'
- if [ "$l" -eq "22" ]
- then
- # vncviewer does not like the jump from grub resolution to 800x600
- # so we (very ugly) start a new vncview.
- killall vncviewer
- vncviewer -encodings raw -fullscreen -viewonly 127.0.0.1:1 &
- fi
- else
- convert=$DUMPS$l'.miff'
- fi
- import -display :0 -window root $convert
-# sleep 0.5
- l=$(expr $l + 1)
- echo "Frame " $convert " at " $(date +"%F_%H:%M:%S.%N")
-done
-
-kill_pid=$(cat $TMP_D/qemu.pid)
-kill $kill_pid
-rm $TMP_D/qemu.pid
-
-# Make minilog for top corner.
-# This ensures that there is no completely back jpg with no info
-# as mencode seg faults if a jpg is completly empty
-# Hey - it also looks pretty :)
-convert $MINILOGO -resize 200x200 -negate -gravity South -background Black -font Helvetica-Bold -fill white -splice 0x36 -pointsize 35 -draw "text 0,0 'AutoTesting'" -transparent black $TMP_D/minilogo.gif
-convert $TMP_D/minilogo.gif -fill grey50 -colorize 40 $TMP_D/minilogo.gif
-l=16
-while [ $l -lt $FRAMES ]
-do
- if [ "$l" -lt "10" ]
- then
- convert=$DUMPS'00'$l'.miff'
- elif [ "$l" -lt "100" ]
- then
- convert=$DUMPS'0'$l'.miff'
- else
- convert=$DUMPS$l'.miff'
- fi
-
- echo "Converting $convert -> $convert.jpg"
-# convert $convert -resize 800x600 $convert.jpg
-#
- convert $convert -resize 800x600 $convert.jpg
- composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif $convert.jpg $convert.jpg
- rm $convert
- l=$(expr $l + 1)
-done
-
-# Create the intro to the video
-title="Autotesting using Qemu"
-text=" $ISO - General Comments \n \n $COMMENTS"
-FOLD_TEXT=$(echo "$text" | fold -s -w 100 )
-convert $LOGO -resize 200 /tmp/logo.jpg
-convert -size 600x440 xc:white -pointsize 25 -fill darkblue -annotate 0x0+250+75 "$title" -pointsize 10 -fill blue -annotate 0x0+50+200 "$FOLD_TEXT" -append /tmp/logo.jpg -bordercolor darkblue -border 20x20 -flatten "$DUMPS"0.jpg
-convert "$DUMPS"0.jpg -resize 800x600 "$DUMPS"1.jpg
-mv "$DUMPS"1.jpg "$DUMPS"0.jpg
-l=1
-while [ $l -lt 16 ]
-do
- if [ "$l" -lt "10" ]
- then
- convert=$DUMPS'00'$l'.miff.jpg'
- elif [ "$l" -lt "100" ]
- then
- convert=$DUMPS'0'$l'.miff.jpg'
- else
- convert=$DUMPS$l'.miff.jpg'
- fi
- composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif "$DUMPS"0.jpg $convert
- l=$(expr $l + 1)
-done
-
-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 --artist "AutoTesting" --title "$VIDEO $COMMENTS" --organization "www.morphix.org" --copyright "copyleft" --date "$TODAY"
-rm $VIDEO
-rm $TMP_D -r
-rm /tmp/logo.jpg
Added: trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh (rev 0)
+++ trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh 2007-07-28 07:22:24 UTC (rev 2543)
@@ -0,0 +1,145 @@
+#!/bin/bash
+get_global_variables ()
+{
+PASSWD="$RANDOM.$RANDOM.$RANDOM.$RANDOM.$RANDOM"
+HOSTNAME=$(hostname)
+OLD_DISPLAY="$DISPLAY"
+TMP_DIR=/tmp/vqbi.$$.tmp
+IPADDRESS=$(sudo ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}')
+
+ISO="/home/morph/webconverger/debian-live-sid-i386-gnome-desktop.iso"
+SENDKEYS="spc,l,i,v,e,spc,kp_enter"
+QEMU_MONITOR_PORT=4444
+GEOMETRY="1280x960"
+CONVERT_DIM="800x600"
+MCODER_DIM="w=800:h=600"
+VIDEO="/tmp/qemu.avi"
+TIME_Q="6"
+VNCREC_MOVIE_FRAMERATE=1
+}
+
+set_up_workspace ()
+{
+mkdir $TMP_DIR 2>/dev/null
+rm ~/.vnc/passwd
+
+cat<<EOF > ~/.vnc/xstartup
+#!/bin/sh
+xsetroot -solid grey
+EOF
+chmod 755 ~/.vnc/xstartup
+
+cat<<EOF > $TMP_DIR/vnc.exp
+spawn vncpasswd
+expect "Password:" { send "$PASSWD\r" }
+expect "Verify:" { send "$PASSWD\r" }
+interact
+puts "\nVNC Password changed\n"
+EOF
+
+expect $TMP_DIR/vnc.exp >/dev/null 2>/dev/null
+echo "VNC Password changed"
+}
+
+start_vnc_sessions ()
+{
+vncserver -nocursor -geometry $GEOMETRY >$TMP_DIR/vncserver.txt 2>&1
+VNSERVER_QEMU=$(cat $TMP_DIR/vncserver.txt | grep 'New' | awk '{ print $5}' )
+VNCSERVER_QMEU_NUMBER=$(cat $TMP_DIR/vncserver.txt | grep 'New' | cut -d: -f2)
+echo "Launched vncserver $VNSERVER_QEMU"
+vncserver -nocursor -geometry 1600x1200 >$TMP_DIR/vncserver.txt 2>&1
+VNSERVER_VNCREC=$(cat $TMP_DIR/vncserver.txt | grep 'New' | awk '{ print $5}' )
+VNCSERVER_VNCREC_NUMBER=$(cat $TMP_DIR/vncserver.txt | grep 'New' | cut -d: -f2)
+echo "Launched vncserver $VNSERVER_VNCREC"
+}
+
+start_vnc_record ()
+{
+#export DISPLAY="$VNSERVER_VNCREC"
+rm /tmp/qemu.1.vnc
+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 &
+}
+
+start_qemu ()
+{
+export DISPLAY=$VNSERVER_QEMU
+echo "Starting qemu, within Dispaly $VNSERVER_QEMU"
+qemu_0.8.4-etch1 -no-kqemu -full-screen -cdrom $ISO -monitor telnet:$IPADDRESS:$QEMU_MONITOR_PORT,server,nowait &
+sleep 10
+i=1
+REACHED_LAST_KB=""
+while [ -z $REACHED_LAST_KB ]
+do
+ KEY=$(echo $SENDKEYS | cut -d, -f$i)
+ if [ "$KEY" != "" ]
+ then
+ echo "sendkey $KEY" | socat - TCP4:$IPADDRESS:$QEMU_MONITOR_PORT
+ else
+ REACHED_LAST_KB="Y"
+ fi
+ let i=i+1
+done
+sleep 3
+}
+
+let_qemu_run ()
+{
+echo "Sleeping for $TIME_Q seconds whilst qemu runs"
+sleep $TIME_Q
+}
+
+stop_qemu ()
+{
+echo "Stopping vncrec and qemu"
+killall vncrec
+killall qemu_0.8.4-etch1
+}
+
+stop_vncservers ()
+{
+echo "Stopping vncservers"
+vncserver -kill :$VNCSERVER_QMEU_NUMBER
+vncserver -kill :$VNCSERVER_VNCREC_NUMBER
+}
+
+
+export_frames ()
+{
+VNCREC_MOVIE_CMD='convert xpm:- '$TMP_DIR'/image-%05d.jpg'
+export VNCREC_MOVIE_CMD
+#vncrec -movie $TMP_DIR/qemu.1.vnc 1>/dev/null 2>&1
+vncrec -movie $TMP_DIR/qemu.1.vnc
+for i in $TMP_DIR/image-*.jpg
+do
+ convert $i -resize $CONVERT_DIM $i
+ echo "Resized $i"
+done
+echo "Finished making Frames"
+}
+
+
+make_video ()
+{
+mencoder mf://$TMP_DIR/*.jpg -mf $MCODER_DIM:fps=4:type=jpg -ovc lavc -lavcopts vcodec=mpeg4:mbd=2:trell -oac copy -o $VIDEO
+}
+
+clean_up ()
+{
+DISPLAY="$OLD_DISPLAY"
+export DISPLAY="$OLD_DISPLAY"
+#rm $TMP_DIR -r
+}
+
+get_global_variables
+set_up_workspace
+start_vnc_sessions
+start_vnc_record
+start_qemu
+let_qemu_run
+stop_qemu
+export_frames
+make_video
+stop_vncservers
+clean_up
Property changes on: trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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. |
|
From: <bms...@us...> - 2007-02-21 23:21:21
|
Revision: 2460
http://svn.sourceforge.net/morphix/?rev=2460&view=rev
Author: bmsleight
Date: 2007-02-21 15:21:18 -0800 (Wed, 21 Feb 2007)
Log Message:
-----------
Improved logos on AutoTesting vidoes, see tomorrows vidoes.
Modified Paths:
--------------
trunk/mmaker/utils/auto-testing/auto_testing.sh
trunk/mmaker/utils/auto-testing/run_testing.sh
Modified: trunk/mmaker/utils/auto-testing/auto_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/auto_testing.sh 2007-02-19 22:06:34 UTC (rev 2459)
+++ trunk/mmaker/utils/auto-testing/auto_testing.sh 2007-02-21 23:21:18 UTC (rev 2460)
@@ -66,6 +66,12 @@
rm $TMP_D/qemu.iso
rm $TMP_D/qemu.pid
+# Make minilog for top corner.
+# This ensures that there is no completely back jpg with no info
+# as mencode seg fautls if a jpg is completly empty
+# Hey - it also looks pretty :)
+convert $MINILOGO -negate -gravity South -background Black -font Helvetica-Bold -fill white -splice 0x14 -draw "text 0,0 'AutoTesting'" -transparent black $TMP_D/minilogo.gif
+convert $TMP_D/minilogo.gif -fill grey50 -colorize 40 $TMP_D/minilogo.gif
l=16
while [ $l -lt $FRAMES ]
do
@@ -79,18 +85,11 @@
convert=$DUMPS$l'.miff'
fi
-# Make minilog for top corner.
-# This ensures that there is no completely back jpg with no info
-# as mencode seg fautls if a jpg is completly empty
-# Hey - it also looks pretty :)
-convert $MINILOGO -negate /tmp/tmp.gif -gravity South -background Black -font Helvetica-Bold -fill white -splice 0x14 -draw "text 0,0 'AutoTesting'" -transparent black $TMP_D/minilogo.gif
-
echo "Converting $convert -> $convert.jpg"
# convert $convert -resize 800x600 $convert.jpg
#
- convert $convert -resize 800x600 $convert.jpg
- convert $convert.jpg -gravity NorthEast -draw "image over 0,0 0,0 '$TMP_D/minilogo.gif'" $convert.jpg
-#
+ convert $convert -resize 800x600 $convert.jpg
+ composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif $convert.jpg $convert.jpg
rm $convert
l=$(expr $l + 1)
done
@@ -114,7 +113,7 @@
else
convert=$DUMPS$l'.miff.jpg'
fi
- cp "$DUMPS"0.jpg $convert
+ composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif "$DUMPS"0.jpg $convert
l=$(expr $l + 1)
done
Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh 2007-02-19 22:06:34 UTC (rev 2459)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh 2007-02-21 23:21:18 UTC (rev 2460)
@@ -176,7 +176,8 @@
cp $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.ogg /home/morph/autobuilds/video/
date
# This machine get hot - have 20 minutes to cool down
- sleep 1200
+# sleep 1200
+ sleep 300
date
fi
#Zip the log and xml files of the base and main_modules
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-29 14:18:13
|
Revision: 2545
http://morphix.svn.sourceforge.net/morphix/?rev=2545&view=rev
Author: bmsleight
Date: 2007-07-29 07:18:08 -0700 (Sun, 29 Jul 2007)
Log Message:
-----------
Updating Autotesting - to make it more portable, video-qemu-booting-iso.sh is also in debian-live svn
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-07-29 00:01:08 UTC (rev 2544)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh 2007-07-29 14:18:08 UTC (rev 2545)
@@ -174,7 +174,8 @@
echo $DIVIDER
sudo isomorph --list $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN
echo $DIVIDER
- 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
+ /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 -s 800x600 -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
gzip -c $LOG_FILE >$VID_DIR/$LOG_FILE_BN'_'$TODAY'_.gz'
Modified: trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh 2007-07-29 00:01:08 UTC (rev 2544)
+++ trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh 2007-07-29 14:18:08 UTC (rev 2545)
@@ -1,9 +1,48 @@
#!/bin/bash
+#
+# video-qemu-booting-iso.sh #
+# #
+# Copyleft (c) 2007 Brendan M. Sleight #
+# <bmsleight@barwap._REMOVE_SPAM_TRAP.com> #
+# #
+# This script is licensed under the GNU GPL v2 or later. #
+# #
+# On Debian systems, this license can be obtained via #
+# /usr/share/common-licenses/GPL #
+# #
+# Required packages/applications :- #
+# bash, expect, ffmpeg2thoera, imagemagick, mencoder, #
+# qemu, vncrec, vncserver #
+# #
+# Requires /etc/vnc.conf to be ammended. #
+# #
+# #
+
+
+lock_file_check ()
+{
+if [ -f /tmp/video-qemu-booting-iso.lock ]
+then
+ echo "Lock file /tmp/video-qemu-booting-iso.lock present indicating $0 is already running"
+ exit
+fi
+VNCCONF=$(cat /etc/vnc.conf | grep "^\$vncStartup")
+if [ "VNCCONF" -neq "\$vncStartup = \"~/.vnc/xstartup\";" ]
+ then
+ echo "Requires vnc.conf to have the line:- "
+ echo "\$vncStartup = \"~/.vnc/xstartup\";"
+ echo "Else two lots of windowm mangers will launched in the extra vnc sessions."
+ exit
+fi
+echo "Lock file /tmp/video-qemu-booting-iso.lock present indicating $0 is running" >/tmp/video-qemu-booting-iso.lock
+}
+
get_global_variables ()
{
PASSWD="$RANDOM.$RANDOM.$RANDOM.$RANDOM.$RANDOM"
HOSTNAME=$(hostname)
OLD_DISPLAY="$DISPLAY"
+TODAY=$(date +"%F")
TMP_DIR=/tmp/vqbi.$$.tmp
IPADDRESS=$(sudo ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}')
VNCREC_MOVIE_FRAMERATE=1
@@ -78,8 +117,6 @@
start_vnc_record ()
{
export DISPLAY="$VNSERVER_VNCREC"
-#export DISPLAY="$OLD_DISPLAY"
-rm /tmp/qemu.1.vnc
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 &
@@ -139,6 +176,8 @@
do
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.
composite -dissolve 15 -gravity northeast $TMP_DIR/minilogo.png $i $i
done
echo "Finished making Frames"
@@ -154,14 +193,14 @@
#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
-ffmpeg2theora -o $VIDEO $TMP_DIR/tmp.avi
+ffmpeg2theora -o $VIDEO $TMP_DIR/tmp.avi --artist "AutoTesting" --title "Video of Qemu booting $ISO" --date "$TODAY"
}
clean_up ()
{
DISPLAY="$OLD_DISPLAY"
export DISPLAY="$OLD_DISPLAY"
-#rm $TMP_DIR -r
+rm $TMP_DIR -r
}
@@ -195,7 +234,7 @@
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 " Launches a couple of vncserver session, kills other vncrec and qemu session running."
+ echo " Launches a couple of vncserver session, kills other vncrec and qemu sessions running."
echo " Requires sudo ifconfig"
exit
fi
@@ -203,6 +242,7 @@
ISO=$1
VIDEO=$2
+lock_file_check
get_options_and_defaults
get_global_variables
set_up_workspace
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-08-02 19:21:50
|
Revision: 2552
http://morphix.svn.sourceforge.net/morphix/?rev=2552&view=rev
Author: bmsleight
Date: 2007-08-02 12:20:55 -0700 (Thu, 02 Aug 2007)
Log Message:
-----------
Stop vncrec stalling
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-07-31 18:49:18 UTC (rev 2551)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh 2007-08-02 19:20:55 UTC (rev 2552)
@@ -57,6 +57,7 @@
echo $TITLED
date
find /home/morph/autobuilds/mainmod/sarge/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
+find /home/morph/autobuilds/mainmod/etch/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
find /home/morph/autobuilds/mainmod/sid/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
find /home/morph/autobuilds/base/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
find /home/morph/autobuilds/minimod/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
Modified: trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh 2007-07-31 18:49:18 UTC (rev 2551)
+++ trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh 2007-08-02 19:20:55 UTC (rev 2552)
@@ -171,7 +171,23 @@
convert $TMP_DIR/minilogo.png -fill grey50 -colorize 40 $TMP_DIR/minilogo.png
VNCREC_MOVIE_CMD="convert xpm:- $TMP_DIR/image-%05d.jpg"
export VNCREC_MOVIE_CMD
-vncrec -movie $TMP_DIR/qemu.1.vnc
+
+vncrec -movie $TMP_DIR/qemu.1.vnc >/dev/null 2>&1 &
+# vncrec can hand sometimes hang and not terminate, after all frames have been generated.
+# So we monitor vncrec and kill vncrec when no further frames are being generated
+MORE_FRAMES=1
+NUMBER_FRAMES=0
+while [ "$MORE_FRAMES" -gt "$NUMBER_FRAMES" ]
+do
+ NUMBER_FRAMES="$MORE_FRAMES"
+ sleep 60
+ MORE_FRAMES=$(ls $TMP_DIR/image-*.jpg | wc -w)
+ echo "Frames: $NUMBER_FRAMES to $MORE_FRAMES generated"
+done
+ps ax | grep vncrec
+killall vncrec
+echo "vncrec -movie killed"
+
for i in $TMP_DIR/image-*.jpg
do
convert $i -resize $CONVERT_DIM $i
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-08-20 21:21:59
|
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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X