X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-vk1-f175.google.com (mail-vk1-f175.google.com [209.85.221.175]) by lists.alpinelinux.org (Postfix) with ESMTP id 3449AF816A5 for ; Tue, 5 Feb 2019 13:13:33 +0000 (UTC) Received: by mail-vk1-f175.google.com with SMTP id 197so769742vkf.4 for ; Tue, 05 Feb 2019 05:13:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NerIf16fN3Dlev8knGvT7tAZf66XK52X51mFEHgic7o=; b=r9NiqUVtyQeU37zSmMXOPkdkAwAf6H1rD6daiqgMdR9Qh+QUFXx5u7O9j3bUoFBzjG rXTYWUbY/dIMn0kR0O1iUyN2TGgBA20Ia4j9kJGxebDQ5Wu0BS9sxYh7EL46ufKnrK/t qHHc8LCdm+0xdfSM/XqrR9r/jnfxiPzthHIcCuv36q0QOI6t3/jyYCATKRjPa/KKZyYk Mzi2/nqlvoTwtLCP69YYicptwLaiz6k1/1XOCRmjdX8QRlCsslVpDzz1BGj2rexkJAo8 76iy93M8LqBMX/VVGJgVyP6uuPXq6J9PKF464iBhSfhRLywa1fXrmsFIIQcwSZUNxv4p U3+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NerIf16fN3Dlev8knGvT7tAZf66XK52X51mFEHgic7o=; b=KRys+9oAPXWpRQBsks8/B/zxJ77umOLQoSoNI6+soCXZ9aRGsbFcfKINpesUsnhcJS 6FTuNIhInH+wpQp5s4IuwSMl8aXVbvnmt2+ZOxgrSnImZArRpS/vxP4WnNsfKjJpJJTr lUGkJIfFjr+g81VYOUtCHmOp0ShiFsN4DW+juVXS4AtfxgQdcMDX+N00dsS1For3HqoN d7hE2NeSjs9pdQYPL6F3tag8UVUs3cb2jytj6qVF3Eo0PK1XcE7we5L/RaLeArpLyd1J iXZmYYG55kfLoibzaqqiW1qd8kvQszMd+q3yWid2fyu0e/akBh7V31/jSVp1HfJunqD3 dyfQ== X-Gm-Message-State: AHQUAuawVF4l6VwkZEQssg6ND0sSSPc2BbiDh4IFzgODPfXxdcGm7AMF 9Ay/0HdgC1h2zHgJYen5oaXmR+idVcHGRVc1S/U= X-Google-Smtp-Source: AHgI3IZ8oJkMQNAA4yP75RAceqe3/WouyYQ/gPByz8moNGnW63b8ju/kBQMMGtjedWW0uH/Gwu45j0FDeiWaZ/iv2QE= X-Received: by 2002:a1f:7cca:: with SMTP id x193mr1959971vkc.89.1549372412401; Tue, 05 Feb 2019 05:13:32 -0800 (PST) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 References: <20190123151052.19776-1-raschi.alex@gmail.com> In-Reply-To: <20190123151052.19776-1-raschi.alex@gmail.com> From: Leonardo Arena Date: Tue, 5 Feb 2019 14:13:21 +0100 Message-ID: Subject: Re: [alpine-aports] [PATCH] testing/luakit: enable tests To: Alex Raschi Cc: alpine-aports Content-Type: multipart/alternative; boundary="000000000000441df705812560b4" --000000000000441df705812560b4 Content-Type: text/plain; charset="UTF-8" Hi, please see some comments below. On Wed, Jan 23, 2019 at 4:11 PM Alex Raschi wrote: > * move a dir in -doc subpackage too > --- > testing/luakit/APKBUILD | 28 +++++++++++++------ > testing/luakit/tests.patch | 55 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 75 insertions(+), 8 deletions(-) > create mode 100644 testing/luakit/tests.patch > > diff --git a/testing/luakit/APKBUILD b/testing/luakit/APKBUILD > index d0cbf548d0..17ad52bb03 100644 > --- a/testing/luakit/APKBUILD > +++ b/testing/luakit/APKBUILD > @@ -2,18 +2,18 @@ > # Maintainer: > pkgname=luakit > pkgver=2.1 > -pkgrel=0 > +pkgrel=1 > pkgdesc="Fast, small, webkit based browser framework extensible by Lua" > -url="https://github.com/luakit/luakit" > +url="https://luakit.github.io/" > arch="all !s390x" # luajit is missing for s390x > -license="GPL-3.0" > -depends="lua5.1-filesystem lua5.1-luassert" > -depends_dev="" > +license="GPL-3.0-or-later" > +depends="gsettings-desktop-schemas lua5.1-filesystem" > makedepends="webkit2gtk-dev luajit-dev" > -install="" > +checkdepends="xvfb luacheck lua5.1-luassert" > subpackages="$pkgname-doc" > source="$pkgname-$pkgver.tar.gz:: > https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz > - config-mk.patch" > + config-mk.patch > + tests.patch" > builddir="$srcdir/$pkgname-$pkgver" > > build() { > @@ -21,10 +21,22 @@ build() { > make PREFIX=/usr USE_LUAJIT=1 DEVELOPMENT_PATHS=0 > } > > +check() { > + cd "$builddir" > + make run-tests > +} > + > The tests seem to use the local display server rathen than xvfb. They will fail on the headless systems like the buildboxes. > package() { > cd "$builddir" > make PREFIX=/usr DESTDIR="$pkgdir" install > } > > +doc() { > + mkdir -p "$subpkgdir"/usr/share/luakit > + mv "$pkgdir"/usr/share/luakit/doc "$subpkgdir"/usr/share/luakit > + default_doc > +} > + > You can avoid defining a custom doc() function. Just move usr/share/luakit/doc/* into "$pkgdir"/usr/share/doc/$pkgname/. This is the approach been used so far to move stuff in doc subpkg. Thanks! /eo --000000000000441df705812560b4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

= please see some comments below.

On Wed, Jan 23, 2019 at 4:11 PM Alex Raschi <raschi.alex@gmail.com> wrote:
<= blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-l= eft:1px solid rgb(204,204,204);padding-left:1ex">* move a dir in -doc subpa= ckage too
---
=C2=A0testing/luakit/APKBUILD=C2=A0 =C2=A0 | 28 +++++++++++++------
=C2=A0testing/luakit/tests.patch | 55 +++++++++++++++++++++++++++++++++++++= +
=C2=A02 files changed, 75 insertions(+), 8 deletions(-)
=C2=A0create mode 100644 testing/luakit/tests.patch

diff --git a/testing/luakit/APKBUILD b/testing/luakit/APKBUILD
index d0cbf548d0..17ad52bb03 100644
--- a/testing/luakit/APKBUILD
+++ b/testing/luakit/APKBUILD
@@ -2,18 +2,18 @@
=C2=A0# Maintainer:
=C2=A0pkgname=3Dluakit
=C2=A0pkgver=3D2.1
-pkgrel=3D0
+pkgrel=3D1
=C2=A0pkgdesc=3D"Fast, small, webkit based browser framework extensibl= e by Lua"
-url=3D"https://github.com/luakit/luakit"
+url=3D"https://luakit.github.io/"
=C2=A0arch=3D"all !s390x" # luajit is missing for s390x
-license=3D"GPL-3.0"
-depends=3D"lua5.1-filesystem lua5.1-luassert"
-depends_dev=3D""
+license=3D"GPL-3.0-or-later"
+depends=3D"gsettings-desktop-schemas lua5.1-filesystem"
=C2=A0makedepends=3D"webkit2gtk-dev luajit-dev"
-install=3D""
+checkdepends=3D"xvfb luacheck lua5.1-luassert"
=C2=A0subpackages=3D"$pkgname-doc"
=C2=A0source=3D"$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz
-=C2=A0 =C2=A0 =C2=A0 =C2=A0config-mk.patch"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0config-mk.patch
+=C2=A0 =C2=A0 =C2=A0 =C2=A0tests.patch"
=C2=A0builddir=3D"$srcdir/$pkgname-$pkgver"

=C2=A0build() {
@@ -21,10 +21,22 @@ build() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 make PREFIX=3D/usr USE_LUAJIT=3D1 DEVELOPMENT_P= ATHS=3D0
=C2=A0}

+check() {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$builddir"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0make run-tests
+}
+

The tests seem to use the local displ= ay server rathen than xvfb. They will fail on the headless systems like the= buildboxes.

=C2=A0
=C2=A0package() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 cd "$builddir"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 make PREFIX=3D/usr DESTDIR=3D"$pkgdir"= ; install
=C2=A0}

+doc() {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/share/luaki= t
+=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/share/luakit/doc &qu= ot;$subpkgdir"/usr/share/luakit
+=C2=A0 =C2=A0 =C2=A0 =C2=A0default_doc
+}
+


You can avoid defining= a custom doc() function. Just move usr/share/luakit/doc/* into "$pkgd= ir"/usr/share/doc/$pkgname/.
This is the approach been used = so far to move stuff in doc subpkg.

=C2=A0Thanks!

/eo
--000000000000441df705812560b4-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---