From a091073d55c38414de492af92377931f98fc9a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= Date: Mon, 19 Aug 2024 14:14:33 +0200 Subject: [PATCH] Package tests --- .fmf/version | 1 + gating.yaml | 7 +++++++ perl-Try-Tiny.spec | 33 ++++++++++++++++++++++++++++++++- plans/sanity.fmf | 5 +++++ tests/upstream-tests.fmf | 12 ++++++++++++ 5 files changed, 57 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..1608530 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +# RHEL +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/perl-Try-Tiny.spec b/perl-Try-Tiny.spec index 25a0918..3c3ddc3 100644 --- a/perl-Try-Tiny.spec +++ b/perl-Try-Tiny.spec @@ -7,7 +7,7 @@ Name: perl-Try-Tiny Summary: Minimal try/catch with proper localization of $@ Version: 0.31 -Release: 10%{?dist} +Release: 11%{?dist} License: MIT URL: https://metacpan.org/release/Try-Tiny Source0: https://cpan.metacpan.org/authors/id/E/ET/ETHER/Try-Tiny-%{version}.tar.gz @@ -42,6 +42,9 @@ Requires: perl(Sub::Util) # Do not provide private modules from tests packaged as a documentation %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_docdir}/ +# Remove private test modules +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(TryUser\\)$ + %description This module provides bare bones try/catch statements that are designed to minimize common mistakes with eval blocks, and NOTHING else. @@ -53,8 +56,22 @@ few dependencies, namely Devel::Declare and Scope::Upper that are occasionally problematic, and the additional catch filtering uses Moose type constraints, which may not be desirable either. +%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 Try-Tiny-%{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 @@ -64,6 +81,14 @@ make %{?_smp_mflags} make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -delete %{_fixperms} -c %{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 make test @@ -74,7 +99,13 @@ make test %{perl_vendorlib}/Try/ %{_mandir}/man3/Try::Tiny.3* +%files tests +%{_libexecdir}/%{name} + %changelog +* Mon Aug 19 2024 Michal Josef Špaček - 0.31-11 +- Package tests + * Mon Jun 24 2024 Troy Dawson - 0.31-10 - Bump release for June 2024 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..961e47f --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,12 @@ +summary: Upstream tests +contact: Michal Josef Spacek +component: perl-Try-Tiny +require: perl-Try-Tiny-tests +test: /usr/libexec/perl-Try-Tiny/test +enabled: true +tag: + - rhel-buildroot +adjust: + - enabled: false + when: distro < rhel-10 or distro < centos-stream-10 + continue: false