From fac198eebc2425ceb3bef185429e8f3c87a1af18 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 13 Sep 2023 16:02:12 +0200 Subject: [PATCH] Package tests; Modernize spec --- .fmf/version | 1 + gating.yaml | 7 +++++ perl-Module-CPANfile.spec | 54 ++++++++++++++++++++++++++++++++++----- plans/sanity.fmf | 5 ++++ tests/upstream-tests.fmf | 4 +++ 5 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/sanity.fmf create mode 100644 tests/upstream-tests.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..282e16b --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/perl-Module-CPANfile.spec b/perl-Module-CPANfile.spec index 372a095..536a343 100644 --- a/perl-Module-CPANfile.spec +++ b/perl-Module-CPANfile.spec @@ -1,16 +1,18 @@ Name: perl-Module-CPANfile Version: 1.1004 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Parse cpanfile License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/Module-CPANfile Source0: https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/Module-CPANfile-%{version}.tar.gz BuildArch: noarch +BuildRequires: coreutils BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter BuildRequires: perl(base) BuildRequires: perl(Carp) +BuildRequires: perl(Config) BuildRequires: perl(Cwd) BuildRequires: perl(CPAN::Meta) >= 2.12091 BuildRequires: perl(CPAN::Meta::Feature) >= 2.12091 @@ -36,23 +38,53 @@ Requires: perl(Pod::Usage) %?perl_default_filter %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(CPAN::Meta\\)$ +# Filter modules bundled for tests +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir} +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(t::Utils\\) %description Module::CPANfile is a tool to handle cpanfile format to load application specific dependencies, not just for CPAN distributions. +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-Test-Harness + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + %prep %setup -q -n Module-CPANfile-%{version} +# Help generators to recognize Perl scripts +for F in t/*.t; do + perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F" + chmod +x "$F" +done %build -perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 -make %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -make pure_install DESTDIR=$RPM_BUILD_ROOT -%{_fixperms} $RPM_BUILD_ROOT/* +%{make_install} +%{_fixperms} %{buildroot}/* + +# Install tests +mkdir -p %{buildroot}%{_libexecdir}/%{name} +cp -a t %{buildroot}%{_libexecdir}/%{name} +# Remove author tests +rm %{buildroot}%{_libexecdir}/%{name}/t/author-pod-syntax.t +cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF' +#!/bin/sh +cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)" +EOF +chmod +x %{buildroot}%{_libexecdir}/%{name}/test %check +unset AUTHOR_TESTING +export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}') make test %files @@ -60,12 +92,20 @@ make test %doc Changes README %{_bindir}/mymeta-cpanfile %{_bindir}/cpanfile-dump -%{perl_vendorlib}/* +%{perl_vendorlib}/Module/CPANfile* +%{perl_vendorlib}/cpanfile* %{_mandir}/man1/mymeta-cpanfile* %{_mandir}/man1/cpanfile-dump* -%{_mandir}/man3/* +%{_mandir}/man3/Module::CPANfile* +%{_mandir}/man3/cpanfile* + +%files tests +%{_libexecdir}/%{name} %changelog +* Tue Sep 12 2023 Jitka Plesnikova - 1.1004-18 +- Package tests + * Thu Jul 20 2023 Fedora Release Engineering - 1.1004-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/plans/sanity.fmf b/plans/sanity.fmf new file mode 100644 index 0000000..a72ded4 --- /dev/null +++ b/plans/sanity.fmf @@ -0,0 +1,5 @@ +summary: Sanity tests +discover: + how: fmf +execute: + how: tmt diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf new file mode 100644 index 0000000..8be85c8 --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,4 @@ +summary: Upstream tests +component: perl-Module-CPANfile +require: perl-Module-CPANfile-tests +test: /usr/libexec/perl-Module-CPANfile/test