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

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

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.