Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Florian Weimer
fa5dd6e32e Update License tag with build system licenses 2025-11-14 15:32:39 +01:00
Martin Coufal
4387be6cd3 Fix Fedora gating tests.
Remove outdated tests.yml and replace it with FMF/TMT. The upstream
testsuite needed a build path fix and definition of pre-build variables.
2025-11-10 13:00:48 +01:00
8 changed files with 40 additions and 22 deletions

1
.fmf/version Normal file
View file

@ -0,0 +1 @@
1

7
gating.yaml Normal file
View file

@ -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}

View file

@ -1,8 +1,8 @@
Summary: GNU macro processor
Name: m4
Version: 1.4.20
Release: 2%{?dist}
License: GPL-3.0-or-later AND GFDL-1.3-or-later
Release: 3%{?dist}
License: GPL-3.0-or-later AND GFDL-1.3-or-later AND FSFULLR AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-or-later WITH Texinfo-exception AND GPL-2.0-or-later WITH Autoconf-exception-generic AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND MIT
Source0: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig
URL: https://www.gnu.org/software/m4/
@ -50,6 +50,9 @@ make %{?_smp_mflags} check
%{_mandir}/man1/m4.1*
%changelog
* Fri Nov 14 2025 Florian Weimer <fweimer@redhat.com> - 1.4.20-3
- Update License tag with build system licenses
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

5
plans/ci.fmf Normal file
View file

@ -0,0 +1,5 @@
summary: CI Gating Plan
discover:
how: fmf
execute:
how: tmt

View file

@ -1,16 +0,0 @@
---
# Tests for Classic and Container
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- classic
- container
tests:
- testsuite
required_packages:
- autoconf
- automake
- rpm-build
- wget

View file

@ -53,7 +53,7 @@ $(METADATA): Makefile
@echo "Type: Regression" >> $(METADATA)
@echo "TestTime: 3h" >> $(METADATA)
@echo "RunFor: m4" >> $(METADATA)
@echo "Requires: m4" >> $(METADATA)
@echo "Requires: m4 rpm-build autoconf automake gettext gcc" >> $(METADATA)
@echo "Priority: Normal" >> $(METADATA)
@echo "License: GPLv2+" >> $(METADATA)
@echo "Confidential: no" >> $(METADATA)

17
tests/testsuite/main.fmf Normal file
View file

@ -0,0 +1,17 @@
summary: testsuite
description: ''
contact: Martin Cermak <mcermak@redhat.com>
component:
- m4
test: ./runtest.sh
framework: beakerlib
require:
- m4
- gcc
- rpm-build
- autoconf
- automake
- gettext
duration: 3h
extra-summary: /tools/m4/Regression/testsuite
extra-task: /tools/m4/Regression/testsuite

7
tests/testsuite/runtest.sh Normal file → Executable file
View file

@ -26,10 +26,10 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Include Beaker environment
. /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="m4"
VERSION=$(rpm -q m4 --qf '%{VERSION}')
rlJournalStart
rlPhaseStartSetup
@ -48,7 +48,8 @@ rlJournalStart
rlPhaseEnd
rlPhaseStart FAIL "Run tests"
rlRun "pushd $TMPD/BUILD/m4-*"
rlRun "pushd $TMPD/BUILD/m4-${VERSION}-build/m4-${VERSION}"
rlRun "eval `rpm --eval %___build_pre_env`"
# el7 package creates couple tests/*log files (per testcase)
# el6 package doesn't, so we'll create some explicitly
rlRun "make check > tests/testout.log 2> tests/testerr.log"
@ -61,7 +62,7 @@ rlJournalStart
rlPhaseEnd
rlPhaseStart FAIL "Check for no FAILed test"
rlRun "[[ $(cat tests/*log | grep -i FAIL | grep -P -v '^#' | wc -l) -eq 0 ]]"
rlRun "[[ $(cat tests/*log | grep FAIL | grep -P -v '^#' | wc -l) -eq 0 ]]"
rlPhaseEnd
rlPhaseStart FAIL "Show test results summary"