From 146c16ec0115a61aa607b4d69376d8fc5f5532a6 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 3 May 2023 11:01:25 +0200 Subject: [PATCH] Package tests --- .fmf/version | 1 + gating.yaml | 7 +++++++ perl-Module-Install.spec | 44 ++++++++++++++++++++++++++++++++++++++++ plans/sanity.fmf | 5 +++++ tests/upstream-tests.fmf | 4 ++++ 5 files changed, 61 insertions(+) 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-Install.spec b/perl-Module-Install.spec index 15ee399..a0efcb1 100644 --- a/perl-Module-Install.spec +++ b/perl-Module-Install.spec @@ -106,6 +106,9 @@ Requires: perl(YAML::Tiny) >= 1.38 %global __requires_exclude %__requires_exclude|^perl\\(File::Spec\\)$ %global __requires_exclude %__requires_exclude|^perl\\(YAML::Tiny\\)$ +# Filter modules bundled for tests +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir} +%global __requires_exclude %__requires_exclude|^perl\\(MyTest\\)$ %description Module::Install is a package for writing installers for CPAN (or CPAN-like) @@ -113,9 +116,28 @@ distributions that are clean, simple, minimalist, act in a strictly correct manner with ExtUtils::MakeMaker, and will run on any Perl installation version 5.005 or newer. +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-Test-Harness +%if %{with perl_Module_Install_enables_optional_test} && 0%{!?perl_bootstrap:1} +Requires: perl(Module::Install::AuthorTests) +Requires: perl(Module::Install::ExtraTests) >= 0.007 +%endif +Requires: perl(utf8) + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + %prep %setup -q -n Module-Install-%{version} %patch -P0 -p1 +# Help generators to recognize Perl scripts +for F in `find t -name *.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 @@ -126,7 +148,25 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 rm -f %{buildroot}/blib/lib/auto/share/dist/Module-Install/dist_file.txt %{_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 +# Some tests write into temporary files/directories. The easiest 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 +export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}') make test %files @@ -136,9 +176,13 @@ make test %{_mandir}/man3/Module::* %{_mandir}/man3/inc::* +%files tests +%{_libexecdir}/%{name} + %changelog * Wed May 03 2023 Jitka Plesnikova - 1.21-1 - 1.21 bump +- Package tests * Fri Jan 20 2023 Fedora Release Engineering - 1.19-24 - 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..731531a --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,4 @@ +summary: Upstream tests +component: perl-Module-Install +require: perl-Module-Install-tests +test: /usr/libexec/perl-Module-Install/test