[SCM] debian-live/autotesting branch, master, updated. 41781ce03d7504d5aa7c91f2f08c3a09a0601ecc
Brendan M. Sleight
bms.debian at barwap.com
Sat Jul 19 22:03:25 UTC 2008
The following commit has been merged in the master branch:
commit 41781ce03d7504d5aa7c91f2f08c3a09a0601ecc
Author: Brendan M. Sleight <bms.debian at barwap.com>
Date: Sat Jul 19 22:03:05 2008 +0000
Tweaking. run-batch-autotesting: allow md5sum to be called anything. video-qemu-booting: very ugly sleep 100 to avoid monitor problem, producing videos in proprietary format flash,java using vnc2swf
diff --git a/run-batch-autotesting.sh b/run-batch-autotesting.sh
index 5593bb2..22101ae 100755
--- a/run-batch-autotesting.sh
+++ b/run-batch-autotesting.sh
@@ -48,6 +48,13 @@ URLLIST=$1
DIRECTORY=$2
VIDEO_DIRECTORY=$3
+if [ -z "$4" ]
+then
+ MD5SUM_FILE="MD5SUMS"
+else
+ MD5SUM_FILE="$4"
+fi
+
if [ -f /tmp/run-batch-autotesting.lock ]
then
echo "Lock file /tmp/run-batch-autotesting.lock present indicating $0 is already running"
@@ -61,8 +68,8 @@ for URL in $URLS
do
BASE_NAME=$(echo $URL | rev | cut -d"/" -f 1 | rev)
PART_URL=$(echo $URL | rev | cut -d"/" -f 2- | rev)
- MD5SUMS="$PART_URL/MD5SUMS"
- HAS_FILE_UPDATED_TODAY=$(find $DIRECTORY/ -ctime -1 \! -type d | grep "$BASE_NAME")
+ MD5SUMS="$PART_URL/$MD5SUM_FILE"
+ HAS_FILE_UPDATED_TODAY=$(find $DIRECTORY/ -ctime -0 \! -type d | grep "$BASE_NAME")
if [ -n "$HAS_FILE_UPDATED_TODAY" ]
then
echo "$BASE_NAME already downloaded today "
@@ -70,11 +77,11 @@ do
else
echo "Downloading $URL"
rm $DIRECTORY/$BASE_NAME 2>/dev/null
- rm $DIRECTORY/MD5SUMS 2>/dev/null
+ rm $DIRECTORY/$MD5SUM_FILE 2>/dev/null
wget --no-verbose --tries=3 --timeout=60 --directory-prefix=$DIRECTORY $URL
wget --no-verbose --tries=3 --timeout=60 --directory-prefix=$DIRECTORY $MD5SUMS
MD5SUM_LOCAL=$(md5sum $DIRECTORY/$BASE_NAME | cut --fields=1 --delimiter=\ )
- MD5SUM_REMOTE=$(cat $DIRECTORY/MD5SUMS | grep "$BASE_NAME" | head -n 1 | cut --fields=1 --delimiter=\ )
+ MD5SUM_REMOTE=$(cat $DIRECTORY/$MD5SUM_FILE | grep "$BASE_NAME" | head -n 1 | cut --fields=1 --delimiter=\ )
if [[ $MD5SUM_LOCAL != $MD5SUM_REMOTE ]]
then
echo "$BASE_NAME - md5sums different, remote: $MD5SUM_REMOTE, local: $MD5SUM_LOCAL. "
@@ -82,8 +89,9 @@ do
else
DATE_IMAGE_BUILT=$(ls -lh --time-style long-iso $DIRECTORY/$BASE_NAME |tr -s " "|cut -d" " -f6)
DATE_DOWNLOADED=$(ls -lc --time-style long-iso $DIRECTORY/$BASE_NAME |tr -s " "|cut -d" " -f6)
- VIDEO_NAME="$VIDEO_DIRECTORY/${BASE_NAME}_Built_${DATE_IMAGE_BUILT}_Tested_${DATE_DOWNLOADED}_.ogg"
- LOG_FILE="$VIDEO_DIRECTORY/${BASE_NAME}_Built_${DATE_IMAGE_BUILT}_Tested_${DATE_DOWNLOADED}_.log"
+ mkdir "$VIDEO_DIRECTORY/${BASE_NAME}"
+ VIDEO_NAME="$VIDEO_DIRECTORY/${BASE_NAME}/Built_${DATE_IMAGE_BUILT}_Tested_${DATE_DOWNLOADED}_.ogg"
+ LOG_FILE="$VIDEO_DIRECTORY/${BASE_NAME}/Built_${DATE_IMAGE_BUILT}_Tested_${DATE_DOWNLOADED}_.log"
echo "AutoTesting $BASE_NAME $VIDEO_NAME"
$VIDEO_QEMU_BOOTING -g 1024x768 -t 300 -v 5 $DIRECTORY/$BASE_NAME $VIDEO_NAME >$LOG_FILE 2>&1
echo "Finished Autotesting $BASE_NAME"
diff --git a/video-qemu-booting-iso.sh b/video-qemu-booting-iso.sh
index ddd9f26..e3f44a6 100755
--- a/video-qemu-booting-iso.sh
+++ b/video-qemu-booting-iso.sh
@@ -117,6 +117,7 @@ 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 -depth 24 -shared -truecolor -viewonly -encoding raw -record $TMP_DIR/qemu.1.vnc :$VNCSERVER_QMEU_NUMBER &
+#sleep 20
}
start_qemu ()
@@ -131,11 +132,13 @@ else
QEMU_OPTS="-cdrom"
fi
$QEMU_BIN -full-screen $QEMU_OPTS $ISO -monitor telnet:$IPADDRESS:$QEMU_MONITOR_PORT,server,nowait &
-sleep 10 # This is really important. I not sure why, vnc catch-up time maybe, but it just works :), remove at your peril
+sleep 100 # This is important. Im not sure why, vnc catch-up time maybe, but it just works :), remove at your peril
+
i=1
REACHED_LAST_KB=""
while [ -z $REACHED_LAST_KB ]
do
+ sleep 2
KEY=$(echo $SENDKEYS | cut -d, -f$i)
if [ "$KEY" != "" ]
then
@@ -173,6 +176,9 @@ gen_video ()
#Need to runs some tests to ensure vncrec -movie does temriante at end of session.
echo "Generating video from recorded vnc stream. "
vncrec -movie $TMP_DIR/qemu.1.vnc 2>/dev/null | ffmpeg2theora $FFMPEG_DIM_SCALE --videoquality $VQUALITY --inputfps 40 --artist "AutoTesting.livecd.org" --title "Video of Qemu booting $ISO" --date "$TODAY" -o $VIDEO - 2>/dev/null
+/home/autotesting/pyvnc2swf/edit.py -o $VIDEO.swf -c -s 0.703125 -t video $TMP_DIR/qemu.1.vnc
+VIDEO_NO_EXT=${VIDEO%.*}
+mv $VIDEO.html ${VIDEO_NO_EXT}_View_swf_Video_.html
}
gen_video_preview ()
--
debian-live/autotesting
More information about the debian-live-changes
mailing list