suzanne.soy/os-test-framework
1
0
Fork 0
Code Issues 48 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Changed the xvfb resolution so that the window title bar is visible, removed fluxbox's background picture

Browse Source
This commit is contained in:
Georges Dupéron 2018-07-03 00:00:32 +02:00
parent 352e5977d9
commit 1c27435169
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -53,7 +53,7 @@ install:
script:
- (cd example-os && make)
- ./utils/gui-wrapper.sh ./test/${MODE}.sh
- ./utils/gui-wrapper.sh 800x600x24 ./test/${MODE}.sh
- |
./utils/auto-push.sh "https://github.com/jsmaniac/travis-os.git" \
"git@github.com:jsmaniac/travis-os-deploy-artifacts.git" \

8
example-os/Makefile
View File

@ -13,16 +13,16 @@ test: test-qemu-system-i386 test-qemu-system-arm test-virtualbox test-bochs Make
.PHONY: test-qemu-system-i386
test-qemu-system-i386: os.sh ../deploy-screenshots Makefile
(cd .. && xvfb-run -a ./test/qemu-system-i386.sh)
(cd .. && ./utils/gui-wrapper.sh 800x600x24 ./test/qemu-system-i386.sh)
.PHONY: test-qemu-system-arm
test-qemu-system-arm: os.sh ../deploy-screenshots Makefile
(cd .. && xvfb-run -a ./test/qemu-system-arm.sh)
(cd .. && ./utils/gui-wrapper.sh 800x600x24 ./test/qemu-system-arm.sh)
.PHONY: test-virtualbox
test-virtualbox: os.sh ../deploy-screenshots Makefile
(cd .. && xvfb-run -a ./test/virtualbox.sh)
(cd .. && ./utils/gui-wrapper.sh 800x600x24 ./test/virtualbox.sh)
.PHONY: test-bochs
test-bochs: os.sh ../deploy-screenshots Makefile
(cd .. && xvfb-run -a ./test/bochs.sh)
(cd .. && ./utils/gui-wrapper.sh 800x600x24 ./test/bochs.sh)

21
utils/gui-wrapper.sh
View File

@ -1,2 +1,21 @@
#!/bin/sh
xvfb-run -a sh -c 'fluxbox 2>/dev/null & sleep 3; "$@"' utils/gui-wrapper.sh-subshell "$@"
resolution="$1" # e.g. 800x600x24 (width x height x bits_per_pixel)
shift # the following arguments are the program to execute and its arguments
bg="$(mktemp --suffix='bg.png')"
fb_cfg="$(mktemp --suffix='fluxbox.cfg')"
# Create solid black background
convert -size 16x16 xc:black "$bg"
# Create minimalist fluxbox configuration
cat > "$fb_cfg" <<EOF
background: fullscreen
background.pixmap: $bg
EOF
xvfb-run -a --server-args="-screen 0 ${resolution}" sh -c 'fluxbox -rc '"$fb_cfg"' 2>/dev/null & sleep 3; "$@"' utils/gui-wrapper.sh-subshell "$@"
# Cleanup
rm "$bg" "$fb_cfg"