diff options
| -rw-r--r-- | TODO | 7 | ||||
| -rwxr-xr-x | bin/g-i-installation.sh | 6 |
2 files changed, 4 insertions, 9 deletions
@@ -79,13 +79,6 @@ See link:http://jenkins.debian.net/userContent/about.html["about jenkins.debian. === g-i-installation_*: -<h01ger> $ compare -metric AE snapshot_012700.png snapshot_012800.png foo.png -<h01ger> 109 -<h01ger> = 109 pixel are different \o/ -<h01ger> (thats lxde desktop clock changing) -<h01ger> kdm login clock changing results in 126 pixel changing -<h01ger> yay. while d-i progress bar change means 1190 pixel change - more languages * babelbox.git has a nice langlist diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 35e24a5e..388f4332 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -398,8 +398,10 @@ monitor_system() { # from help let: "Exit Status: If the last ARG evaluates to 0, let returns 1; let returns 0 otherwise." let OLD=NR-400 PRINTF_OLD=$(printf "%06d" $OLD) - # test if this screenshot is the same as the one 400 screenshots ago - if diff -q snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm ; then + # 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) + if [ $PIXEL -lt 200 ] ; then set -x # unless TRIGGER_MODE is empty, matching images means its over if [ ! -z "$TRIGGER_MODE" ] ; then |