From 8b2ab6eb952db74d29cd5dd068555461ed63ea93 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Fri, 8 Nov 2019 13:29:12 -0800 Subject: [PATCH] dev-perl/MogileFS-Server: cleanup QA issues, try to make tests work Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Robin H. Johnson --- .../MogileFS-Server-2.720.0-r1.ebuild | 14 +++++++++----- .../MogileFS-Server/MogileFS-Server-2.730.0.ebuild | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild b/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild index 1ab8f1f30f2bb..8d2a778a8ff5f 100644 --- a/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild +++ b/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild @@ -10,7 +10,8 @@ inherit user perl-module DESCRIPTION="Server for the MogileFS distributed file system" HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}" -IUSE="mysql sqlite test postgres" +IUSE="mysql +sqlite test postgres" +RESTRICT="!test? ( test )" REQUIRED_USE="test? ( sqlite ) || ( mysql sqlite postgres )" SLOT="0" @@ -38,7 +39,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-2.720.0-gentoo-init-conf.patch" ) -DIST_TEST="never" +DIST_TEST="never verbose" MOGILE_USER="mogile" @@ -77,6 +78,9 @@ pkg_postinst() { chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf } -#src_test() { -# emake test MOGTEST_DBUSER=mogile MOGTEST_DBNAME=tmp_mogiletest MOGTEST_DBTYPE=SQLite -#} +src_test() { + # these need to be in the env and the makeopts + export MOGTEST_DBUSER=mogile MOGTEST_DBNAME=tmp_mogiletest MOGTEST_DBTYPE=SQLite TMPDIR="${T}/mogile" + #perl-module_src_test + make -j1 test TEST_VERBOSE=1 MOGTEST_DBUSER=${MOGTEST_DBUSER} MOGTEST_DBNAME=${MOGTEST_DBNAME} MOGTEST_DBTYPE=${MOGTEST_DBTYPE} TMPDIR="${TMPDIR}" +} diff --git a/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild b/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild index 1ab8f1f30f2bb..8d2a778a8ff5f 100644 --- a/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild +++ b/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild @@ -10,7 +10,8 @@ inherit user perl-module DESCRIPTION="Server for the MogileFS distributed file system" HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}" -IUSE="mysql sqlite test postgres" +IUSE="mysql +sqlite test postgres" +RESTRICT="!test? ( test )" REQUIRED_USE="test? ( sqlite ) || ( mysql sqlite postgres )" SLOT="0" @@ -38,7 +39,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-2.720.0-gentoo-init-conf.patch" ) -DIST_TEST="never" +DIST_TEST="never verbose" MOGILE_USER="mogile" @@ -77,6 +78,9 @@ pkg_postinst() { chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf } -#src_test() { -# emake test MOGTEST_DBUSER=mogile MOGTEST_DBNAME=tmp_mogiletest MOGTEST_DBTYPE=SQLite -#} +src_test() { + # these need to be in the env and the makeopts + export MOGTEST_DBUSER=mogile MOGTEST_DBNAME=tmp_mogiletest MOGTEST_DBTYPE=SQLite TMPDIR="${T}/mogile" + #perl-module_src_test + make -j1 test TEST_VERBOSE=1 MOGTEST_DBUSER=${MOGTEST_DBUSER} MOGTEST_DBNAME=${MOGTEST_DBNAME} MOGTEST_DBTYPE=${MOGTEST_DBTYPE} TMPDIR="${TMPDIR}" +}