summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-04-29 10:19:16 +0200
committerHolger Levsen <holger@layer-acht.org>2014-04-29 10:19:16 +0200
commit79bb3d3e934645bfd4ebcd0c96f1d40303e28353 (patch)
treec6ebec90dce260a0f94062b9b33708f403100595 /bin
parent00a26f7e5aa13f4e640d5b5543c604c72cfde1b8 (diff)
downloadjenkins.debian.net-79bb3d3e934645bfd4ebcd0c96f1d40303e28353.tar.xz
g-i: create fake screenshot if taking a real one fails
Diffstat (limited to 'bin')
-rwxr-xr-xbin/g-i-installation.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 70136286..cd887ec8 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -777,7 +777,7 @@ monitor_system() {
TIMEOUT=$3
fi
cd $RESULTS
- sleep 8 # chosen by fair dice roll
+ sleep 4 # chosen by fair dice roll
hourlimit=16 # hours
echo "Taking screenshots every 2 seconds now, until qemu ends for whatever reasons or $hourlimit hours have passed or if the test seems to hang."
echo
@@ -797,10 +797,8 @@ monitor_system() {
convert $CONVERTOPTS snapshot_${PRINTF_NR}.jpg snapshot_${PRINTF_NR}.ppm
rm snapshot_${PRINTF_NR}.jpg
else
- echo "could not take vncsnapshot from $DISPLAY, lets try again..."
- let NR=NR-1
- PRINTF_NR=$(printf "%06d" $NR)
- echo "$PRINTF_NR: $(date)"
+ echo "$PRINTF_NR: $(date) - could not take vncsnapshot from $DISPLAY - using a blank fake one instead"
+ convert -size $VIDEOSIZE xc:none snapshot_${PRINTF_NR}.ppm
fi
# give signal we are still running
if [ $(($NR % 14)) -eq 0 ] ; then