X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-vs1-f51.google.com (mail-vs1-f51.google.com [209.85.217.51]) by lists.alpinelinux.org (Postfix) with ESMTP id 94DABF81F82 for ; Tue, 5 Feb 2019 14:21:11 +0000 (UTC) Received: by mail-vs1-f51.google.com with SMTP id x64so2232967vsa.5 for ; Tue, 05 Feb 2019 06:21:11 -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=8ipI2IXKj6vo36StPbplA+KzuaecV4LUtE8dk9aaxII=; b=Hw7yZswbCRXOId4zwKYn9IvI1bLJF/gpbFIksLsqOBWZBiQg9VRhO3znoeGIFB/gDe yeKu1EdfpfYy6pe5Fo4PhWL+GA0xxfjnTG5ZFrde5W1Gwpf/korcoy92qAA2/8fCKWD4 +oHzohGVKFPvRPW0ubTyHzEAulAOwZVmMBsdP7r9XpA7DzfSjLX5E0fM+/1Vc8uNcQtx QhwhHP5m635POhl2kO7azAxCp+O1vykoboCMnVNTsIU2FyKb1cy5ro59NQbbS3UURU7W ngvKdbBDFSkBtSizdQ8u3V4ThYxoX7lGZOuXEGzb5AbY2zEfw7X3UJGk47H1RbthiZId D1mw== 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=8ipI2IXKj6vo36StPbplA+KzuaecV4LUtE8dk9aaxII=; b=ciAHz274VVvlG3n9/FeqA9Mt1h4NA8HtTwblVLVUhgMht/3d3G4JN7gERcutCUZ0NB FiLu57QYw1het4h5wFZywHQTe6uvfrEHf/tssykcs24d0e7O1UOtI0pzyK6CNZetVxRq fBvU0pH5kmY8bx3WlTqu1/YVveveHwjV+MMVTl8ow70jgocX3/4RTn9gMk+rmiBQBjOJ jRsI21pc+gLowkgf5CaGXxz8BD8BWkJMaWqq7z9J6YbvorlBpw/IihKw8C3X4KbPqVjj 2/P2IQrgPL36fAaKfIl1dwP8y8PAOW+XifrKJuZyr6SGIX4WfE5beG0VRkMyGw4tbGAv RscQ== X-Gm-Message-State: AHQUAuZkCmp8UQBJOkqdfySewIFp/9OV40u2vPeAw6d5oiQSGBrt6GGY Wq3tvviwxtC4Ryako0hW/8RV3RWn6b2FKwwwbjU= X-Google-Smtp-Source: AHgI3IYRGPQBVLcbrfcHGnhN19wln1xleHlZK+CxrLSey1uyqIeTl5zaHDquXhiWOhqWRb7vCxDdku1D16RENPXzlv8= X-Received: by 2002:a67:5b01:: with SMTP id p1mr2130637vsb.132.1549376471122; Tue, 05 Feb 2019 06:21:11 -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: From: Alex Raschi Date: Tue, 5 Feb 2019 14:20:58 +0000 Message-ID: Subject: Re: [alpine-aports] [PATCH] testing/luakit: enable tests To: Leonardo Arena Cc: alpine-aports Content-Type: multipart/alternative; boundary="0000000000002f4b0b058126526c" --0000000000002f4b0b058126526c Content-Type: text/plain; charset="UTF-8" Hi > The tests seem to use the local display server rathen than xvfb. They will > fail on the headless systems like the buildboxes. Prior to submitting the patch i tried running the tests on a standard alpine chroot (X wasn't running on the chroot and neither on the host) and they succeded. I basically stopped X server and ran them from tty. I don't know if there is a way to force it to use xvfb even when there is another X server running. I will do some research, but they should work on headless. > 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 for tip! On Tue, Feb 5, 2019 at 1:13 PM Leonardo Arena wrote: > 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 > --0000000000002f4b0b058126526c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi

> The tests seem to us= e the local display server rathen than xvfb. They will
> fail on the headless systems like the buildboxes.

Prior to submitting the patch i tried running the= tests on a standard alpine chroot
(X wasn't running on the c= hroot and neither on the host) and they succeded.
I basically sto= pped X server and ran them from tty.

I don't k= now if there is a way to force it to use xvfb even when there is another X<= /div>
server running. I will do some research, but they should work on = headless.

> 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 for tip= !

On Tue, Feb 5, 2019 at 1:13 PM Leonardo Arena <rnalrd@gmail.com> wrote:
Hi,=

please see some comments below.

On Wed, Jan 23, 2019 at= 4:11 PM Alex Raschi <raschi.alex@gmail.com> wrote:
* move a dir in -doc subpackage 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
--0000000000002f4b0b058126526c-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---