diff options
| -rw-r--r-- | APKBUILD.5 | 6 | ||||
| -rw-r--r-- | abuild.in | 12 |
2 files changed, 18 insertions, 0 deletions
@@ -302,6 +302,12 @@ The reason for disabling the check phase should be noted in a comment. Specifies that the package's test suite will be run in .Xr fakeroot 8 . This is necessary for some test suites which fail when run as non-root. +.It Cm checkx11 +Specifies that the package's test suite requires a running X11 server. +This will spawn a D-Bus session bus connected to an Xvfb on display +number 7. The framebuffer can be monitored by running the command +.Cm xwud -in /tmp/Xvfb_screen0 +if desired. .It Cm !dbg Specifies that the package should not be built with a debug information package. @@ -73,6 +73,7 @@ want_check() { [ -n "$ABUILD_BOOTSTRAP" ] && return 1 cross_compiling && return 1 options_has "!check" && return 1 + options_has "checkx11" && checkdepends="$checkdepends xvfb dbus-x11" return 0 } @@ -1533,6 +1534,9 @@ build_abuildrepo() { if options_has "checkroot"; then _check=check_fakeroot fi + if options_has "checkx11"; then + _check=check_x11 + fi if ! want_check; then _check=true fi @@ -1787,6 +1791,14 @@ check_fakeroot() { do_fakeroot "$abuild_path" $forceroot $color_opt $keep_build check } +# wrap check() for tests requiring X11 and/or D-Bus +check_x11() { + cd "$startdir" + Xvfb :7 -screen 0 1280x1024x24 -fbdir /tmp & + trap "kill %1" 0 + env DISPLAY=:7 dbus-run-session "$abuild_path" $forceroot $color_opt $keep_build check +} + # build and package in fakeroot rootpkg() { cd "$startdir" |