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..fefdc9f --- /dev/null +++ b/gating.yaml @@ -0,0 +1,19 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/mk-configure.rpmlintrc b/mk-configure.rpmlintrc new file mode 100644 index 0000000..f8857a4 --- /dev/null +++ b/mk-configure.rpmlintrc @@ -0,0 +1 @@ +addFilter('.*spelling-error.*') diff --git a/mk-configure.spec b/mk-configure.spec index 7efa6f4..88eac3c 100644 --- a/mk-configure.spec +++ b/mk-configure.spec @@ -1,13 +1,13 @@ Name: mk-configure Version: 0.38.3 -Release: 1%{?dist} +Release: 6%{?dist} Summary: A build system on top of bmake License: BSD-2-Clause AND BSD-4-Clause AND ISC # Licenses listed in the doc/LICENSE file URL: https://github.com/cheusov/mk-configure/ -Source0: https://github.com/cheusov/mk-configure/archive/refs/tags/%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/cheusov/mk-configure/archive/%{version}/%{name}-%{version}.tar.gz Source1: mkcmake.macros Patch0: 0001-ignore-incompatible-pointer-types-errors.patch @@ -113,5 +113,19 @@ env bmake test-tests %doc %{_docdir}/mk-configure/examples %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.38.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 0.38.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sun Sep 29 2024 Yaakov Selkowitz - 0.38.3-4 +- Fix macros for flatpak builds + +* Thu Jul 18 2024 Fedora Release Engineering - 0.38.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Feb 19 2024 Carlos Rodriguez-Fernandez - 0.38.3-2 +- Remove concurrency in macro call because it is not well supported due to output redirects * Sat Jan 6 2024 Carlos Rodriguez-Fernandez - 0.38.3-1 - First release diff --git a/mkcmake.macros b/mkcmake.macros index afece0d..903cfea 100644 --- a/mkcmake.macros +++ b/mkcmake.macros @@ -23,5 +23,4 @@ export HOME=%{_tmppath}/mkcmake-home; \ mkdir -p "$HOME"; \ export MKCOMPILERSETTINGS=yes; \ - %{_bindir}/mkcmake \\\ - %{?_smp_mflags} + mkcmake diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/core/data/Makefile b/tests/core/data/Makefile new file mode 100644 index 0000000..ff5f444 --- /dev/null +++ b/tests/core/data/Makefile @@ -0,0 +1,2 @@ +PROG = main +.include diff --git a/tests/core/data/main.c b/tests/core/data/main.c new file mode 100644 index 0000000..e7c0d9b --- /dev/null +++ b/tests/core/data/main.c @@ -0,0 +1,11 @@ +#include + +int sum(int a, int b) { + return a + b; +} + +int main(int argc, char **argv) +{ + printf("2+2=%d\n", sum(2, 2)); + return 0; +} diff --git a/tests/core/main.fmf b/tests/core/main.fmf new file mode 100644 index 0000000..22e38d1 --- /dev/null +++ b/tests/core/main.fmf @@ -0,0 +1 @@ +summary: Smoke tests diff --git a/tests/core/test.sh b/tests/core/test.sh new file mode 100755 index 0000000..b22f59a --- /dev/null +++ b/tests/core/test.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlRun "pushd data" + rlPhaseEnd + + rlPhaseStartTest + rlRun "mkc_compiler_settings" + rlPhaseEnd + + rlPhaseStartTest + rlRun "mkcmake" + rlPhaseEnd + + rlPhaseStartTest + rlRun "./main" + rlPhaseEnd + + rlPhaseStartTest + rlRun "mkcmake clean" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun 'rm -f _mkc*' + rlRun "popd" + rlPhaseEnd +rlJournalEnd diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..ca878e7 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,4 @@ +summary: Validation tests +test: ./test.sh +framework: beakerlib +require: [mk-configure] diff --git a/tests/manpages/main.fmf b/tests/manpages/main.fmf new file mode 100644 index 0000000..3ee823e --- /dev/null +++ b/tests/manpages/main.fmf @@ -0,0 +1,2 @@ +summary: verify manpages +require: [man-db] diff --git a/tests/manpages/test.sh b/tests/manpages/test.sh new file mode 100755 index 0000000..88a1cd0 --- /dev/null +++ b/tests/manpages/test.sh @@ -0,0 +1,17 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +expected_manpages=( + 'mkc_compiler_settings(1)' + 'mkc_install(1)' + 'mkcmake(1)' + 'mk-configure(7)' +) + +rlJournalStart + for page in "${expected_manpages[@]}"; do + rlPhaseStartTest "test ${page}" + rlRun "man --pager=cat '${page}'" + rlPhaseEnd + done +rlJournalEnd