From 15af833cfe56d46f3593edbc40e1e8f88457713f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 24 Jan 2023 20:44:21 +0100 Subject: [PATCH] 2.006008 bump; Package tests --- .fmf/version | 1 + .gitignore | 1 + gating.yaml | 7 ++++++ perl-Sub-Quote.spec | 49 ++++++++++++++++++++++++++++++++++++---- plans/sanity.fmf | 5 ++++ sources | 2 +- tests/upstream-tests.fmf | 4 ++++ 7 files changed, 63 insertions(+), 6 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/.gitignore b/.gitignore index f453656..1d0c31b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /Sub-Quote-2.005001.tar.gz /Sub-Quote-2.006003.tar.gz /Sub-Quote-2.006006.tar.gz +/Sub-Quote-2.006008.tar.gz 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-Sub-Quote.spec b/perl-Sub-Quote.spec index 5eddea0..a5b7308 100644 --- a/perl-Sub-Quote.spec +++ b/perl-Sub-Quote.spec @@ -1,11 +1,12 @@ Name: perl-Sub-Quote -Version: 2.006006 -Release: 11%{?dist} +Version: 2.006008 +Release: 1%{?dist} Summary: Efficient generation of subroutines via string eval License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/Sub-Quote Source0: https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-%{version}.tar.gz BuildArch: noarch +BuildRequires: coreutils BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter @@ -14,10 +15,10 @@ BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(strict) BuildRequires: perl(warnings) # Run-time -BuildRequires: perl(B) BuildRequires: perl(Carp) BuildRequires: perl(Exporter) BuildRequires: perl(Scalar::Util) +BuildRequires: perl(XString) >= 0.003 # Tests BuildRequires: perl(Config) BuildRequires: perl(constant) @@ -28,26 +29,57 @@ BuildRequires: perl(List::Util) BuildRequires: perl(overload) BuildRequires: perl(POSIX) BuildRequires: perl(Test::Builder) -BuildRequires: perl(Test::Fatal) >= 0.003 BuildRequires: perl(Test::More) >= 0.94 BuildRequires: perl(threads) Conflicts: perl-Moo < 2.003000 +Requires: perl(XString) >= 0.003 + +# Filter modules bundled for tests +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir} +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(ErrorLocation\\) +%global __requires_exclude %{__requires_exclude}|^perl\\(InlineModule\\) +%global __requires_exclude %{__requires_exclude}|^perl\\(ThreadsCheck\\) %description This package provides performant ways to generate subroutines from strings. +%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 Sub-Quote-%{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 NO_PERLLOCAL=1 %{make_build} %install %{make_install} -%{_fixperms} $RPM_BUILD_ROOT/* +%{_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 . -r -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 @@ -56,7 +88,14 @@ make test %{perl_vendorlib}/* %{_mandir}/man3/* +%files tests +%{_libexecdir}/%{name} + %changelog +* Tue Jan 24 2023 Jitka Plesnikova - 2.006008-1 +- 2.006008 bump +- Package tests + * Fri Jan 20 2023 Fedora Release Engineering - 2.006006-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_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/sources b/sources index 133f788..e9bd5e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sub-Quote-2.006006.tar.gz) = 19cd0504f039f3218d3f47b3b44714f0baed73a13f97c4552eb1816b7b03186b1bbdf48cc70c2cae616eb9ec81721b30217c7f788176d389df694c9b355ead64 +SHA512 (Sub-Quote-2.006008.tar.gz) = 474c02953555e815c64270299a2ea36a172c11ff739d77a3f5133f4c40d5ec48ad60c09465bd93864c254f180ba73d8381752ac649f8d4f729199f3088e71e26 diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf new file mode 100644 index 0000000..f8d5196 --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,4 @@ +summary: Upstream tests +component: perl-Sub-Quote +require: perl-Sub-Quote-tests +test: /usr/libexec/perl-Sub-Quote/test