X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mailauth3.nine.ch (mailauth3.nine.ch [94.230.211.187]) by lists.alpinelinux.org (Postfix) with ESMTP id 5BB5B5C3337 for ; Mon, 23 Oct 2017 20:29:53 +0000 (GMT) Received: from localhost (localhost [127.0.0.1]) by mailauth3.nine.ch (Postfix) with ESMTP id 1108111FBF5; Mon, 23 Oct 2017 22:29:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mailauth3.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 mailauth3.nine.ch ([127.0.0.1]) by localhost (mailauth3.nine.ch [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bO6UPqR1YTug; Mon, 23 Oct 2017 22:29:52 +0200 (CEST) Received: from vimes (148-73-241-84.dyn.cable.fcom.ch [84.241.73.148]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: pf@1042.ch) by mailauth3.nine.ch (Postfix) with ESMTPSA; Mon, 23 Oct 2017 22:29:51 +0200 (CEST) Received: by vimes (Postfix, from userid 1000) id C5F6280A9F; Mon, 23 Oct 2017 22:29:51 +0200 (CEST) From: Jean-Louis Fuchs To: alpine-aports@lists.alpinelinux.org Cc: Jean-Louis Fuchs Subject: [alpine-aports] [PATCH] community/girara: run test with xvfb, disable tput Date: Mon, 23 Oct 2017 22:29:49 +0200 Message-Id: <20171023202949.14019-1-ganwell@fangorn.ch> X-Mailer: git-send-email 2.13.5 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: * COLOR=0 (disabling tput) wasn't set for all make calls --- I can't reproduce the tput problem locally, but now the girara build-system should not call tput anymore. community/girara/APKBUILD | 14 ++++++++------ community/girara/test.sh | 12 ++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100755 community/girara/test.sh diff --git a/community/girara/APKBUILD b/community/girara/APKBUILD index cb46d05398..0c7f5b06b7 100644 --- a/community/girara/APKBUILD +++ b/community/girara/APKBUILD @@ -10,10 +10,10 @@ url="https://pwmt.org/projects/girara/" arch="all" license="zlib" checkdepends="dbus" -options="!check" # fails due to tput: terminal attributes: No such device or address -makedepends="gtk+3.0-dev libnotify-dev intltool doxygen check-dev ncurses" +makedepends="gtk+3.0-dev libnotify-dev intltool doxygen check-dev xvfb ncurses" subpackages="$pkgname-doc $pkgname-dev $pkgname-lang" -source="https://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz" +source="https://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz + test.sh" builddir="$srcdir"/$pkgname-$pkgver @@ -24,7 +24,7 @@ build() { package() { make PREFIX=/usr DESTDIR="$pkgdir" \ - -C "$builddir" install + -C "$builddir" install COLOR=0 } doc() { @@ -36,8 +36,10 @@ doc() { check () { if [ "$CARCH" != "ppc64le" ]; then - make -C "$builddir" test + cd "$builddir" + "$srcdir/test.sh" fi } -sha512sums="4229565b8a5fad1ecbf42e4f3f852644964a7d5c90154dab9b7dcb5ccd5f25731911452472bbeb28927d1e30d4df6ed066926e11c6a73f0fd5740570493a036f girara-0.2.7.tar.gz" +sha512sums="4229565b8a5fad1ecbf42e4f3f852644964a7d5c90154dab9b7dcb5ccd5f25731911452472bbeb28927d1e30d4df6ed066926e11c6a73f0fd5740570493a036f girara-0.2.7.tar.gz +a8e200a84395d638219f2fdb29055d7caead8fc9db63f98e77944f84e206e1d561d36fe6818a969bf4f8b348b7f5c2f5d0db655c01ee8ee31687ecbe9b8c1494 test.sh" diff --git a/community/girara/test.sh b/community/girara/test.sh new file mode 100755 index 0000000000..690b3c5a38 --- /dev/null +++ b/community/girara/test.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +Xvfb :4242 & +PID=$! +export DISPLAY=:4242 +if make test COLOR=0; then + kill $PID + return 0 +else + kill $PID + return 1 +fi -- 2.13.5 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---