From 7a9fe7d1986efd7b48fd107c0660d8a2087a90c3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 14 Sep 2023 14:16:14 +0200 Subject: [PATCH] Package tests; Modernize spec --- .fmf/version | 1 + gating.yaml | 7 ++++++ perl-Filter-Simple.spec | 53 +++++++++++++++++++++++++++++++++------- plans/sanity.fmf | 5 ++++ tests/upstream-tests.fmf | 4 +++ 5 files changed, 61 insertions(+), 9 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-Filter-Simple.spec b/perl-Filter-Simple.spec index 885bd60..f6d8e4b 100644 --- a/perl-Filter-Simple.spec +++ b/perl-Filter-Simple.spec @@ -1,7 +1,7 @@ %global base_version 0.94 Name: perl-Filter-Simple Version: 0.96 -Release: 500%{?dist} +Release: 501%{?dist} Summary: Simplified Perl source filtering License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/Filter-Simple @@ -11,6 +11,7 @@ BuildArch: noarch Patch0: Filter-Simple-0.94-Upgrade-to-0.95.patch # Unbundled from perl 5.32.0 Patch1: Filter-Simple-0.94-Upgrade-to-0.96.patch +BuildRequires: coreutils BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter @@ -30,33 +31,67 @@ Requires: perl(warnings) # Filter under-specified dependencies %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Text::Balanced\\)$ +# Filter modules bundled for tests +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir} +%global __requires_exclude %{__requires_exclude}|^perl\\(Filter::Simple::.*\\) %description The Filter::Simple Perl module provides a simplified interface to Filter::Util::Call; one that is sufficient for most common cases. +%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 Filter-Simple-%{base_version} -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 + +# 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} +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 +export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}') make test %files %doc Changes README -%{perl_vendorlib}/* -%{_mandir}/man3/* +%{perl_vendorlib}/Filter* +%{_mandir}/man3/Filter::Simple* + +%files tests +%{_libexecdir}/%{name} %changelog +* Thu Sep 14 2023 Jitka Plesnikova - 0.96-501 +- Package tests + * Thu Jul 20 2023 Fedora Release Engineering - 0.96-500 - 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..4844781 --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,4 @@ +summary: Upstream tests +component: perl-Filter-Simple +require: perl-Filter-Simple-tests +test: /usr/libexec/perl-Filter-Simple/test