Take better screenshots; reorganized files

.travis.yml

@@ -2,12 +2,16 @@ language: c
 addons:
   apt:
     packages:
+      # graphical environment
       - scrot
+      - fluxbox
+      # emulators
       - qemu
       - qemu-system-x86
       - qemu-system-arm
       #- virtualbox
       - bochs-sdl
+      # automated GUI testing
       - sikuli-ide
       # Missing dependencies for sikuli-ide
       #- libantlr3-runtime-java # on 16.04
@@ -49,4 +53,4 @@ install:
 
 script:
   - (cd example-os && make)
-  - xvfb-run -a ./test/${MODE}.sh
+  - ./utils/gui-wrapper.sh ./test/${MODE}.sh

test/all.sh

@@ -1,4 +1,4 @@
-xvfb-run ./test/qemu-system-i386.sh
+./utils/gui-wrapper.sh ./test/qemu-system-i386.sh
-xvfb-run ./test/qemu-system-arm.sh
+./utils/gui-wrapper.sh ./test/qemu-system-arm.sh
-xvfb-run ./test/virtualbox.sh
+./utils/gui-wrapper.sh ./test/virtualbox.sh
-xvfb-run ./test/bochs.sh
+./utils/gui-wrapper.sh ./test/bochs.sh

test/bochs.sh

@@ -17,6 +17,6 @@ bochs -qf "$bochsrc" < "$bochscontinue" &
 pid=$!
 runsikulix -r test/check-gradient.sikuli
 
-ansi-screenshots/ansi_screenshot.sh
+./utils/take-screenshots.sh "$(basename "$0" .sh).png"
 
 kill $pid

test/qemu-system-i386.sh

@@ -7,6 +7,6 @@ qemu-system-i386 -drive format=raw,file=${os_file},index=0,if=floppy &
 pid=$!
 runsikulix -r test/check-gradient.sikuli
 
-ansi-screenshots/ansi_screenshot.sh
+./utils/take-screenshots.sh "$(basename "$0" .sh).png"
 
 kill $pid

test/virtualbox.sh

@@ -18,7 +18,7 @@ VBoxManage startvm "$vmname" --type sdl &
 pid=$!
 runsikulix -r test/check-gradient.sikuli
 
-ansi-screenshots/ansi_screenshot.sh
+./utils/take-screenshots.sh "$(basename "$0" .sh).png"
 
 VBoxManage controlvm "$vmname" poweroff
 wait $pid

utils/gui-wrapper.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+xvfb-run -a sh -c 'fluxbox 2>/dev/null & sleep 3; "$@"' utils/gui-wrapper.sh-subshell "$@"

utils/take-screenshots.sh

@@ -0,0 +1,2 @@
+./utils/ansi-screenshots/ansi_screenshot.sh
+scrot "$1"