From d2823fcab6608a2fbf863266b85a749fa82616e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> Date: Fri, 3 Jun 2016 15:42:12 +0200 Subject: Enable tests against server
--- ...t-usr-sbin-gearmand-from-gearmand-package.patch | 32 ++++++++++++++++++++++ perl-Gearman.spec | 16 +++++------ 2 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 Gearman-1.12.008-Do-not-test-usr-sbin-gearmand-from-gearmand-package.patch diff --git a/Gearman-1.12.008-Do-not-test-usr-sbin-gearmand-from-gearmand-package.patch b/Gearman-1.12.008-Do-not-test-usr-sbin-gearmand-from-gearmand-package.patch new file mode 100644 index 0000000..7be776f --- /dev/null +++ b/Gearman-1.12.008-Do-not-test-usr-sbin-gearmand-from-gearmand-package.patch @@ -0,0 +1,32 @@ +From d848d6108ab26b2a470db7a921c576588b14f1a5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> +Date: Fri, 3 Jun 2016 15:36:59 +0200 +Subject: [PATCH] Do not test /usr/sbin/gearmand from gearmand package +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The non-Perl gearmand is not compatible with the tests. + +CPAN RT#68155 + +Signed-off-by: Petr Písař <[email protected]> +--- + t/TestGearman.pm | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/t/TestGearman.pm b/t/TestGearman.pm +index 4058246..807c21c 100644 +--- a/t/TestGearman.pm ++++ b/t/TestGearman.pm +@@ -25,7 +25,6 @@ sub start_server { + "$Bin/../../../../../server/gearmand", # using svn and 'disttest' + dirname($^X) . '/gearmand', # local installs (e.g. perlbrew) + '/usr/bin/gearmand', # where some distros might put it +- '/usr/sbin/gearmand', # where other distros might put it + ); + my $server = first { -e $_ } @loc + or return 0; +-- +2.5.5 + diff --git a/perl-Gearman.spec b/perl-Gearman.spec index 5c1b381..a247e8c 100644 --- a/perl-Gearman.spec +++ b/perl-Gearman.spec @@ -6,8 +6,9 @@ License: GPL+ or Artistic Group: Development/Libraries URL: http://danga.com/gearman/ Source0: http://search.cpan.org/CPAN/authors/id/P/PA/PALIK/Gearman-%{version}.tar.gz +# Avoid non-Perl gearmand is not compatible with the tests, CPAN RT#68155 +Patch0: Gearman-1.12.008-Do-not-test-usr-sbin-gearmand-from-gearmand-package.patch BuildArch: noarch -BuildRequires: coreutils BuildRequires: findutils BuildRequires: make BuildRequires: perl @@ -40,7 +41,10 @@ BuildRequires: perl(POSIX) BuildRequires: perl(Test::More) BuildRequires: perl(vars) # Optional tests: -# gearmand not compatible with the out-dated tests +%if !%{defined perl_bootstrap} +# Break build cycle: perl-Gearman → perl-Gearman-Server → perl-Gearman +BuildRequires: perl-Gearman-Server +%endif # Devel::Gladiator not yet packaged Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) @@ -52,12 +56,7 @@ between languages. %prep %setup -q -n Gearman-%{version} -# Remove tests incompatible with /usr/sbin/gearmand from gearmand, -# they expect /usr/bin/gearmand from perl-Gearman-Server, CPAN RT#68155 -for TEST in t/30-maxqueue.t t/50-wait_timeout.t; do - rm "$TEST" - sed -i -e "\\,^${TEST},d" MANIFEST -done +%patch0 -p1 %build perl Makefile.PL INSTALLDIRS=vendor @@ -79,6 +78,7 @@ make test %changelog * Fri Jun 03 2016 Petr Pisar <[email protected]> - 1.12.008-1 - 1.12.008 bump +- Enable tests against server * Wed Jun 01 2016 Petr Pisar <[email protected]> - 1.12.007-1 - 1.12.007 bump -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/perl-Gearman.git/commit/?h=master&id=d2823fcab6608a2fbf863266b85a749fa82616e6 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list [email protected] https://lists.fedoraproject.org/admin/lists/[email protected]
