From 1cf1ec95eccd5e97bcf2bffadeff26aa622e587a Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 30 Jan 2023 12:20:12 +0100 Subject: [PATCH] Package tests --- .fmf/version | 1 + gating.yaml | 7 ++++++ perl-autodie.spec | 54 +++++++++++++++++++++++++++++++++++++++- plans/sanity.fmf | 5 ++++ tests/upstream-tests.fmf | 4 +++ 5 files changed, 70 insertions(+), 1 deletion(-) 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-autodie.spec b/perl-autodie.spec index bf8a098..cf39ced 100644 --- a/perl-autodie.spec +++ b/perl-autodie.spec @@ -65,6 +65,29 @@ Requires: perl(IPC::System::Simple) >= 0.12 # Remove falsely detected perl(lib) %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(lib\\)$ +# Filter modules bundled for tests +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir} +%global __requires_exclude %{__requires_exclude}|^perl\\(autodie::test.*\\) +%global __requires_exclude %{__requires_exclude}|^perl\\(autodie_.*\\) +%global __requires_exclude %{__requires_exclude}|^perl\\(Caller_helper\\) +%global __requires_exclude %{__requires_exclude}|^perl\\(Hints_.*\\) +%global __requires_exclude %{__requires_exclude}|^perl\\(lethal\\) +%global __requires_exclude %{__requires_exclude}|^perl\\(my::.*\\) +%global __requires_exclude %{__requires_exclude}|^perl\\(Some::Module\\) + +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-Test-Harness +%if %{with perl_autodie_enables_optional_test} && !%{defined perl_bootstrap} +Requires: perl(BSD::Resource) +Requires: perl(Import::Into) >= 1.002004 +%endif + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + %description The "autodie" and "Fatal" pragma provides a convenient way to replace functions that normally return false on failure with equivalents that throw an @@ -77,16 +100,41 @@ autodie in preference to "Fatal". %setup -q -n autodie-%{version} find -type f -exec chmod -x {} + +# 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/bash +set -e +unset AUTHOR_TESTING AUTOMATED_TESTING PERL_CORE RELEASE_TESTING +# Some tests write into temporary files/directories. The solution is to +# copy the tests into a writable directory and execute them from there. +DIR=$(mktemp -d) +pushd "$DIR" +cp -a %{_libexecdir}/%{name}/* ./ +prove -I . -j "$(getconf _NPROCESSORS_ONLN)" +popd +rm -rf "$DIR" +EOF +chmod +x %{buildroot}%{_libexecdir}/%{name}/test %check unset AUTHOR_TESTING AUTOMATED_TESTING PERL_CORE RELEASE_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 @@ -95,9 +143,13 @@ make test %{perl_vendorlib}/* %{_mandir}/man3/* +%files tests +%{_libexecdir}/%{name} + %changelog * Mon Jan 30 2023 Jitka Plesnikova - 2.35-1 - 2.35 bump +- Package tests * Fri Jan 20 2023 Fedora Release Engineering - 2.34-491 - 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/tests/upstream-tests.fmf b/tests/upstream-tests.fmf new file mode 100644 index 0000000..e257ddc --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,4 @@ +summary: Upstream tests +component: perl-autodie +require: perl-autodie-tests +test: /usr/libexec/perl-autodie/test