diff options
| author | Holger Levsen <holger@layer-acht.org> | 2012-12-03 12:13:54 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2012-12-03 12:13:54 +0100 |
| commit | 72dcdeba00e4d5eabb3916ebca1e8974298da8b4 (patch) | |
| tree | 7e6eb263aea3ce24b56a26f34570bdc474c0e35a /bin | |
| parent | 03aeb1ab3bf10a8a7359f479b4340e3f22f227b0 (diff) | |
| download | jenkins.debian.net-72dcdeba00e4d5eabb3916ebca1e8974298da8b4.tar.xz | |
triple fix: munin-plugins, cd-test screenshot match and jenkins-job deploy
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/cd_tester.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh index 0df7f1c5..43adeb76 100755 --- a/bin/cd_tester.sh +++ b/bin/cd_tester.sh @@ -115,9 +115,11 @@ monitor_installation() { vncdo -s localhost:$DISPLAY key ctrl fi # if this screenshot is the same as the one 400 screenshots ago, let stop this - if [ $(($NR % 100)) -eq 0 ] ; then + if [ $(($NR % 100)) -eq 0 ] && [ $NR -gt 400 ] ; then + # from help let: "Exit Status: If the last ARG evaluates to 0, let returns 1; let returns 0 otherwise." let OLD=NR-400 - if diff snapshot_$(printf "%06d" $NR).ppm snapshot_$(printf "%06d" $OLD).ppm /dev/null 2>&1 ; then + if ! diff snapshot_$(printf "%06d" $NR).ppm snapshot_$(printf "%06d" $OLD).ppm ; then + echo Warning: snapshot_$(printf "%06d" $NR).ppm snapshot_$(printf "%06d" $OLD).ppm match, ending installation. break fi fi |