summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriele Giacone <1o5g4r8o@gmail.com>2014-08-17 04:14:17 +0200
committerHolger Levsen <holger@layer-acht.org>2014-08-18 12:36:20 -0400
commit344c04ef3fc3e96abf0dab3118d92ee6c73ae9cc (patch)
tree0443ddcf7867c6a06412b8bbcae35033e65dd71d
parent8be3147fd9d95f78b1c8d8c516df728cb26024a0 (diff)
downloadjenkins.debian.net-344c04ef3fc3e96abf0dab3118d92ee6c73ae9cc.tar.xz
Fix gocr recognition by converting background to black.
-rwxr-xr-xbin/g-i-installation.sh16
1 files changed, 10 insertions, 6 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 83fca526..efc122b0 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -64,6 +64,13 @@ else
PRESEEDCFG="${DI_LANG}_preseed.cfg"
fi
+#
+# video
+#
+VIDEOBITRATE=1200
+VIDEOSIZE=1024x768
+VIDEOBGCOLOR=gray10
+
fetch_if_newer() {
url="$2"
file="$1"
@@ -129,9 +136,7 @@ bootstrap_system() {
echo "Doing g-i installation test for $NAME now."
# qemu related variables (incl kernel+initrd) - display first, as we grep for this in the process list
QEMU_OPTS="-display vnc=$DISPLAY -no-shutdown -enable-kvm -cpu host"
- VIDEOBITRATE=1200
- VIDEOSIZE=1024x768 # don't change this (or adjust what needs to be shaved when ocr'ing later)
- CONVERTOPTS="-gravity center -background gray10 -extent $VIDEOSIZE"
+ CONVERTOPTS="-gravity center -background $VIDEOBGCOLOR -extent $VIDEOSIZE"
if [ -n "$IMAGE" ] ; then
QEMU_OPTS="$QEMU_OPTS -cdrom $IMAGE -boot d"
case $NAME in
@@ -877,9 +882,8 @@ monitor_system() {
# search for known text using ocr of screenshot and break out of this loop if certain content is found
#
GOCR=$(mktemp)
- # shave 112 pixels on the sides and 84 on top+bottom
- # so that 1024x768 becomes 800x600
- convert -shave 112x84 snapshot_${PRINTF_NR}.ppm $GOCR.ppm
+ # gocr likes black background
+ convert -fill black -opaque $VIDEOBGCOLOR snapshot_${PRINTF_NR}.ppm $GOCR.ppm
gocr $GOCR.ppm > $GOCR
LAST_LINE=$(tail -1 $GOCR |cut -d "]" -f2- || true)
STACK_LINE=$(egrep "(Call Trace|end trace)" $GOCR || true)