commit: 9a4c12008deabbc3b06cddd4a431d07e8c015f04
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 11:28:14 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 11:28:14 2016 +0000
URL: https://gitweb.gentoo.org/dev/dilfridge.git/commit/?id=9a4c1200
www-apache/mod_perl: Make tests work
Package-Manager: portage-2.3.1
.../mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch | 36 ++++++++++++++++++++++
www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild | 9 +++---
2 files changed, 41 insertions(+), 4 deletions(-)
diff --git
a/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch
b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch
new file mode 100644
index 0000000..578878f
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch
@@ -0,0 +1,36 @@
+Tests fail because the server banner contains "Gentoo" instead of "Unix".
Disable them.
+
+
+diff -ruN mod_perl-2.0.10-rc1.orig/t/response/TestAPI/server_const.pm
mod_perl-2.0.10-rc1/t/response/TestAPI/server_const.pm
+--- mod_perl-2.0.10-rc1.orig/t/response/TestAPI/server_const.pm
2016-09-30 14:45:31.000000000 +0200
++++ mod_perl-2.0.10-rc1/t/response/TestAPI/server_const.pm 2016-10-01
13:18:02.359794404 +0200
+@@ -25,7 +25,7 @@
+
+ my $r = shift;
+
+- plan $r, tests => 6;
++ plan $r, tests => 4;
+
+ # test Apache2::ServerUtil constant subroutines
+
+@@ -45,13 +45,13 @@
+ ok t_cmp($server_descr, qr!\bworld domination series/2\.0\b!,
+ 'Apache2::ServerUtil::get_server_description() -- component');
+
+- # assuming ServerTokens Full (default) the banner equals description
+- ok t_cmp(Apache2::ServerUtil::get_server_banner, $server_descr,
+- 'Apache2::ServerUtil::get_server_banner()');
+-
+- # version is just an alias for banner
+- ok t_cmp(Apache2::ServerUtil::get_server_version, $server_descr,
+- 'Apache2::ServerUtil::get_server_version()');
++# # assuming ServerTokens Full (default) the banner equals description
++# ok t_cmp(Apache2::ServerUtil::get_server_banner, $server_descr,
++# 'Apache2::ServerUtil::get_server_banner()');
++
++# # version is just an alias for banner
++# ok t_cmp(Apache2::ServerUtil::get_server_version, $server_descr,
++# 'Apache2::ServerUtil::get_server_version()');
+
+ Apache2::Const::OK;
+ }
diff --git a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
b/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
index a76dd22..2f71868 100644
--- a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
@@ -24,8 +24,7 @@ SRC_TEST=do
# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
# The minimum versions requested here are the bundled versions.
-# The test dependencies are from CPAN (Bundle::Apache2); the list
-# is not complete yet as not all are packaged.
+# The test dependencies are from CPAN (Bundle::Apache2).
# When all MPMs are disabled via useflags, the apache ebuild selects a
# default one, which will likely need threading...
@@ -62,12 +61,13 @@ PATCHES=(
"${FILESDIR}/${PN}"-2.0.1-sneak-tmpdir.patch # seems to fix the make
test problem
"${FILESDIR}/${PN}"-2.0.4-inline.patch # 550244
"${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
+ "${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
)
src_prepare() {
perl-module_src_prepare
- # some chainsaw unbundling
+ # chainsaw unbundling
rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/
}
@@ -94,7 +94,8 @@ src_test() {
chown nobody:nobody "${WORKDIR}" "${T}"
fi
- TMPDIR="${T}" HOME="${T}/" perl-module_src_test
+ MAKEOPTS+=" -j1"
+ TMPDIR="${T}" HOME="${T}/" TEST_VERBOSE=1 perl-module_src_test
}
src_install() {
