From 1b4ae866ffb3192e781e7e82a27f8a9ba03d0de7 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 26 Dec 2012 00:59:38 +0100 Subject: fixup: use compare from imagemagick to count number of different pixels in two images, to test if the installation hangs --- bin/g-i-installation.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 388f4332..bd0b452b 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -400,7 +400,7 @@ monitor_system() { PRINTF_OLD=$(printf "%06d" $OLD) # test if this screenshot is basically the same as the one 400 screenshots ago # 200 pixels difference between to images is tolerated, to ignore updating clocks - PIXEL=$(compare -metric AE snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm /dev/null) + PIXEL=$(compare -metric AE snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm /dev/null 2>&1) if [ $PIXEL -lt 200 ] ; then set -x # unless TRIGGER_MODE is empty, matching images means its over @@ -410,7 +410,8 @@ monitor_system() { figlet "Installation hangs." break else - # fail next time screenshot matchs + # this is only reached once in rescue mode + # and the next matching screenshots will cause a failure... TRIGGER_MODE="already_matched" # really kick off trigger: let TRIGGER_NR=NR -- cgit v1.2.3-70-g09d2