From 74a482c8ce6a44f8f1299b1063294cac4e685396 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 28 May 2024 13:32:25 +0800 Subject: [PATCH 1/6] Rewrite CI tests --- .fmf/version | 1 + plans/basic.fmf | 6 ++++++ tests/main.fmf | 12 ++++++++++++ tests/make_check.sh | 9 +++++++++ tests/tests.yml | 21 --------------------- 5 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/main.fmf delete mode 100644 tests/tests.yml 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/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..d57536e --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,6 @@ +summary: Basic smoke test +discover: + how: fmf + dist-git-source: true +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..1f84a51 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,12 @@ +test: bash ./make_check.sh .. +duration: 50m +framework: shell +require: + - make + - gcc + - autoconf + - autoconf-archive + - automake + - libtool + - doxygen + - rpm-build diff --git a/tests/make_check.sh b/tests/make_check.sh index 00f8111..cc77d45 100644 --- a/tests/make_check.sh +++ b/tests/make_check.sh @@ -9,6 +9,15 @@ check_return_value () { } cd $1 + +VERSION=`rpmspec -q --srpm --qf "%{version}" libdatrie.spec 2>/dev/null` + +if test -d libdatrie-$VERSION-build; +then cd libdatrie-$VERSION-build; +fi + +cd libdatrie-$VERSION + autoreconf -f -i -v ./configure --prefix=/usr check_return_value $? diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 68a065c..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,21 +0,0 @@ -- hosts: localhost - vars: - - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" - tags: - - classic - remote_user: root - roles: - - role: standard-test-source # to get the source tar ball to do “make check” - - role: standard-test-basic - required_packages: - - make - - gcc - - autoconf - - autoconf-archive - - automake - - libtool - - doxygen - tests: - - make-check: - dir: ./ - run: bash ./make_check.sh ./source From 95ffac6b20c7c5138d867933e48d8ac2bdb919d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:36:39 +0000 Subject: [PATCH 2/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libdatrie.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdatrie.spec b/libdatrie.spec index c20a07c..75e3b73 100644 --- a/libdatrie.spec +++ b/libdatrie.spec @@ -1,6 +1,6 @@ Name: libdatrie Version: 0.2.13 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Implementation of Double-Array structure for representing trie License: LGPL-2.1-or-later URL: http://linux.thai.net/projects/datrie @@ -62,6 +62,9 @@ LD_LIBRARY_PATH=../datrie/.libs %make_build check %{_pkgdocdir}-devel/*.{html,css,png,js,svg} %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.2.13-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.2.13-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2bf7e7a1930ae999c37028ecc4985c6cf792b009 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 16 Jan 2025 13:16:03 +0800 Subject: [PATCH 3/6] Rewrite CI tests to use beakerlib framework --- plans/basic.fmf | 1 - tests/main.fmf | 6 ++++-- tests/make_check.sh | 27 --------------------------- tests/runtest.sh | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 30 deletions(-) delete mode 100644 tests/make_check.sh create mode 100755 tests/runtest.sh diff --git a/plans/basic.fmf b/plans/basic.fmf index d57536e..c1627f9 100644 --- a/plans/basic.fmf +++ b/plans/basic.fmf @@ -1,6 +1,5 @@ summary: Basic smoke test discover: how: fmf - dist-git-source: true execute: how: tmt diff --git a/tests/main.fmf b/tests/main.fmf index 1f84a51..fa9a675 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -1,6 +1,6 @@ -test: bash ./make_check.sh .. +test: ./runtest.sh duration: 50m -framework: shell +framework: beakerlib require: - make - gcc @@ -9,4 +9,6 @@ require: - automake - libtool - doxygen + - libdatrie + - gnome-common - rpm-build diff --git a/tests/make_check.sh b/tests/make_check.sh deleted file mode 100644 index cc77d45..0000000 --- a/tests/make_check.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -set -x - -check_return_value () { - if [ $1 != 0 ] ; then - exit $1 - fi -} - -cd $1 - -VERSION=`rpmspec -q --srpm --qf "%{version}" libdatrie.spec 2>/dev/null` - -if test -d libdatrie-$VERSION-build; -then cd libdatrie-$VERSION-build; -fi - -cd libdatrie-$VERSION - -autoreconf -f -i -v -./configure --prefix=/usr -check_return_value $? -make -check_return_value $? -make check -exit $? diff --git a/tests/runtest.sh b/tests/runtest.sh new file mode 100755 index 0000000..3d4a741 --- /dev/null +++ b/tests/runtest.sh @@ -0,0 +1,35 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlShowPackageVersion libdatrie + rlRun -t -l "VERSION=$(rpm -q libdatrie --queryformat='%{version}')" 0 "Get VERSION" + FEDORA_VERSION=$(rlGetDistroRelease) + rlLog "FEDORA_VERSION=${DISTRO_RELEASE}" + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlFetchSrcForInstalled "libdatrie" + rlRun "rpm --define '_topdir $tmp' -i *src.rpm" + rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory" + rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec" + if [ -d BUILD/libdatrie-${VERSION}-build ]; then + rlRun -t -l "pushd BUILD/libdatrie-${VERSION}-build/libdatrie-${VERSION}" + else + rlRun -t -l "pushd BUILD/libdatrie-${VERSION}" + fi + rlPhaseEnd + + rlPhaseStartTest + rlRun "set -o pipefail" + rlRun -t -l "NOCONFIGURE=1 gnome-autogen.sh" + rlRun -t -l "./configure" + rlRun -t -l "make" + rlRun -t -l "make check" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd; popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd From af56244bce9c4e7ddd340554f00658ddad9e4e9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:55:57 +0000 Subject: [PATCH 4/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libdatrie.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdatrie.spec b/libdatrie.spec index 75e3b73..607c816 100644 --- a/libdatrie.spec +++ b/libdatrie.spec @@ -1,6 +1,6 @@ Name: libdatrie Version: 0.2.13 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Implementation of Double-Array structure for representing trie License: LGPL-2.1-or-later URL: http://linux.thai.net/projects/datrie @@ -62,6 +62,9 @@ LD_LIBRARY_PATH=../datrie/.libs %make_build check %{_pkgdocdir}-devel/*.{html,css,png,js,svg} %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.2.13-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 0.2.13-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a416454990ce4b42314f340804962df388eb9850 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:30:46 +0000 Subject: [PATCH 5/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libdatrie.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdatrie.spec b/libdatrie.spec index 607c816..07c12e4 100644 --- a/libdatrie.spec +++ b/libdatrie.spec @@ -1,6 +1,6 @@ Name: libdatrie Version: 0.2.13 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Implementation of Double-Array structure for representing trie License: LGPL-2.1-or-later URL: http://linux.thai.net/projects/datrie @@ -62,6 +62,9 @@ LD_LIBRARY_PATH=../datrie/.libs %make_build check %{_pkgdocdir}-devel/*.{html,css,png,js,svg} %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.2.13-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 0.2.13-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c40046ff28625e3edc3a5e665dab83e5d2a8500e Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 28 Nov 2025 13:56:44 +0800 Subject: [PATCH 6/6] Update to 0.2.14 --- .gitignore | 1 + libdatrie.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 79469cd..d1ab039 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libdatrie-0.2.8.tar.xz /libdatrie-0.2.9.tar.xz /libdatrie-0.2.13.tar.xz +/libdatrie-0.2.14.tar.xz diff --git a/libdatrie.spec b/libdatrie.spec index 07c12e4..b975150 100644 --- a/libdatrie.spec +++ b/libdatrie.spec @@ -1,6 +1,6 @@ Name: libdatrie -Version: 0.2.13 -Release: 12%{?dist} +Version: 0.2.14 +Release: 1%{?dist} Summary: Implementation of Double-Array structure for representing trie License: LGPL-2.1-or-later URL: http://linux.thai.net/projects/datrie @@ -62,6 +62,10 @@ LD_LIBRARY_PATH=../datrie/.libs %make_build check %{_pkgdocdir}-devel/*.{html,css,png,js,svg} %changelog +* Fri Nov 28 2025 Peng Wu - 0.2.14-1 +- Update to 0.2.14 +- Resolves: RHBZ#2416998 + * Thu Jul 24 2025 Fedora Release Engineering - 0.2.13-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 5c0f034..a14cd76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libdatrie-0.2.13.tar.xz) = db3c879d825ead5871c12ef3a06bb093cb1708a6e7e20775eaf82356af9dd6ad54c6b5cabbe1773f2494d3dfa2426528fdd49441038b6294b70ccb1a3d90099a +SHA512 (libdatrie-0.2.14.tar.xz) = c5df387a1c9b5fae65eff69102651f4f054d873194d97faa8e329282353156fa4fb41a1ea771b24ade3f0ad2a548d85d7950a4aa6ed4e5c356bc504720e792d1