pesa 15/07/10 03:01:36 Modified: qbs-1.4.1.ebuild ChangeLog Log: Enable more (all) unit tests. Use a custom test runner script that correctly sets LD_LIBRARY_PATH for each test binary. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.2 dev-util/qbs/qbs-1.4.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/qbs-1.4.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/qbs-1.4.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/qbs-1.4.1.ebuild?r1=1.1&r2=1.2 Index: qbs-1.4.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qbs-1.4.1.ebuild 8 Jul 2015 16:34:54 -0000 1.1 +++ qbs-1.4.1.ebuild 10 Jul 2015 03:01:36 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.1.ebuild,v 1.1 2015/07/08 16:34:54 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.1.ebuild,v 1.2 2015/07/10 03:01:36 pesa Exp $ EAPI=5 @@ -59,6 +59,7 @@ -recursive CONFIG+=qbs_disable_rpath CONFIG+=qbs_enable_project_file_updates + $(usex test 'CONFIG+=qbs_enable_unit_tests' '') QBS_INSTALL_PREFIX="${EPREFIX}/usr" QBS_LIBRARY_DIRNAME="$(get_libdir)" ) @@ -85,7 +86,18 @@ "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die einfo "Running autotests" - default + + # simply exporting LD_LIBRARY_PATH doesn't work + # we have to use a custom testrunner script + local testrunner=${S}/gentoo-testrunner + cat <<-EOF > "${testrunner}" + #!/bin/sh + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}" + exec "\$@" + EOF + chmod +x "${testrunner}" + + emake TESTRUNNER="'${testrunner}'" check } src_install() { 1.19 dev-util/qbs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?rev=1.19&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?rev=1.19&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?r1=1.18&r2=1.19 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ChangeLog 8 Jul 2015 16:34:54 -0000 1.18 +++ ChangeLog 10 Jul 2015 03:01:36 -0000 1.19 @@ -1,6 +1,10 @@ # ChangeLog for dev-util/qbs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.18 2015/07/08 16:34:54 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.19 2015/07/10 03:01:36 pesa Exp $ + + 10 Jul 2015; Davide Pesavento <p...@gentoo.org> qbs-1.4.1.ebuild: + Enable more (all) unit tests. Use a custom test runner script that correctly + sets LD_LIBRARY_PATH for each test binary. *qbs-1.4.1 (08 Jul 2015)
