X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mailauth4.nine.ch (mailauth4.nine.ch [94.230.211.190]) by lists.alpinelinux.org (Postfix) with ESMTP id 786A95C5352 for ; Mon, 10 Apr 2017 15:26:29 +0000 (GMT) Received: from localhost (localhost [127.0.0.1]) by mailauth4.nine.ch (Postfix) with ESMTP id DA56ABFA26; Mon, 10 Apr 2017 17:26:28 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mailauth4.nine.ch X-Spam-Flag: NO X-Spam-Score: -0.999 X-Spam-Level: X-Spam-Status: No, score=-0.999 tagged_above=-999 required=5.6 tests=[ALL_TRUSTED=-1, HEADER_FROM_DIFFERENT_DOMAINS=0.001] autolearn=disabled Received: from mailauth4.nine.ch ([127.0.0.1]) by localhost (mailauth4.nine.ch [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Tms5N4gOhel9; Mon, 10 Apr 2017 17:26:27 +0200 (CEST) Received: from vimes (office.adfinis.com [95.128.36.166]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: pf@1042.ch) by mailauth4.nine.ch (Postfix) with ESMTPSA; Mon, 10 Apr 2017 17:26:27 +0200 (CEST) Received: by vimes (Postfix, from userid 1000) id AA2CC202B9; Mon, 10 Apr 2017 17:26:27 +0200 (CEST) From: Jean-Louis Fuchs To: alpine-aports@lists.alpinelinux.org Cc: Jean-Louis Fuchs Subject: [alpine-aports] [PATCH] testing/zathura: run checks on xvfb Date: Mon, 10 Apr 2017 17:26:20 +0200 Message-Id: <20170410152620.7601-1-ganwell@fangorn.ch> X-Mailer: git-send-email 2.11.1 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- I previously sent a patch, that fails on the build-server because there is no X11 for the check. Using xvfb is obviously the way to run the tests, IF we want to do this. I'm not sure if it is worth the trouble. Please review. testing/zathura/APKBUILD | 28 ++++++++++++++++++++-------- testing/zathura/test.sh | 12 ++++++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) create mode 100755 testing/zathura/test.sh diff --git a/testing/zathura/APKBUILD b/testing/zathura/APKBUILD index 05cb399dd8..a5ff02e805 100644 --- a/testing/zathura/APKBUILD +++ b/testing/zathura/APKBUILD @@ -4,27 +4,39 @@ # Maintainer: Jean-Louis Fuchs pkgname=zathura pkgver=0.3.7 -pkgrel=0 +pkgrel=1 pkgdesc="zathura - highly customizable and functional document viewer" url="https://pwmt.org/projects/zathura/" arch="all" license="zlib" depends="libmagic" +# mesa-dri-swrast, dbus for tests only makedepends="girara-dev file-dev sqlite-dev intltool check-dev py-docutils - ncurses" + ncurses mesa-dri-swrast dbus xvfb" subpackages="$pkgname-doc $pkgname-dev $pkgname-lang" -source="https://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz" +source="https://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz + test.sh" -_builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir/$pkgname-$pkgver" build() { - make -C "$_builddir" || return 1 - make -C "$_builddir/doc" || return 1 + make -C "$builddir" + make -C "$builddir/doc" } package() { make PREFIX=/usr DESTDIR="$pkgdir" \ - -C "$_builddir" install || return 1 + -C "$builddir" install } -sha512sums="830a1b88820507a40a20b046c504d8ab3022a35c2c4c0d93a67f77ab5e31d746362a6f28fb9786a647cd0bfd943306aca74cbb2092774aedfb52380e713df533 zathura-0.3.7.tar.gz" +check() { + cd "$builddir" + "$srcdir/test.sh" +} + +md5sums="b2c9e23e9f494e1ced5069f850dba673 zathura-0.3.7.tar.gz +629958fdb6a9c3b1b7c2968ecd18f6f4 test.sh" +sha256sums="22afff89f4093f22fb82188417ff9bfa9695b19a4fe894dca05b7c821b390ff0 zathura-0.3.7.tar.gz +569d14ef2d95562e9cd251ba9bd22abfca397cfe0ef84085ff66d5e9ff53f082 test.sh" +sha512sums="830a1b88820507a40a20b046c504d8ab3022a35c2c4c0d93a67f77ab5e31d746362a6f28fb9786a647cd0bfd943306aca74cbb2092774aedfb52380e713df533 zathura-0.3.7.tar.gz +295af504eb3f20171f4ab766a39e1211778cae1187f90dfd1db1601424e5c13c36953697f2244dbe0b10bc6c8d0db3166096551f92254fb2a4182b280dab32d4 test.sh" diff --git a/testing/zathura/test.sh b/testing/zathura/test.sh new file mode 100755 index 0000000000..24f9a78afa --- /dev/null +++ b/testing/zathura/test.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +Xvfb :4242 & +PID=$! +export DISPLAY=:4242 +if make test; then + kill $PID + return 0 +else + kill $PID + return 1 +fi -- 2.11.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---