From 89d13e8a13642cfc56e46ed22066137026a33a2e Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Thu, 2 May 2024 16:07:53 +0200 Subject: [PATCH 1/5] bz580078-valgrind-aborts-with-vex-x86...: Fix gcc 14 warnings --- .../case1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/case1.c b/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/case1.c index 525db32..95b5e2b 100644 --- a/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/case1.c +++ b/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/case1.c @@ -1,6 +1,8 @@ #include #include +extern int NSS_NoDB_Init(void*); + int main() { NSS_NoDB_Init(NULL); From bc3f0036337ca4a3a1b1910fd480ab4611dd5bfa Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Wed, 26 Jun 2024 17:31:27 +0200 Subject: [PATCH 2/5] Update relevancies for rhel 10 --- .../main.fmf | 4 ++++ Sanity/32bit-on-64bit-os/main.fmf | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/main.fmf b/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/main.fmf index 3844c59..e488ec0 100644 --- a/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/main.fmf +++ b/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/main.fmf @@ -45,6 +45,10 @@ adjust: - enabled: false when: arch != x86_64 + # No i686 in RHEL-10+ + - enabled: false + when: distro >= rhel-10 + # Testing farm does not support installing i686 packages in bodhi update testing, # so we disable this test there until that capacity is implemented. - enabled: false diff --git a/Sanity/32bit-on-64bit-os/main.fmf b/Sanity/32bit-on-64bit-os/main.fmf index 1b41f20..af58f83 100644 --- a/Sanity/32bit-on-64bit-os/main.fmf +++ b/Sanity/32bit-on-64bit-os/main.fmf @@ -26,6 +26,10 @@ adjust: - enabled: false when: arch != x86_64 + # No i686 in RHEL-10+ + - enabled: false + when: distro >= rhel-10 + # Testing farm does not support installing i686 packages in bodhi update testing, # so we disable this test there until that capacity is implemented. - enabled: false From 36937a99b2c520041f48be0ebe23c621d278a3ee Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Fri, 17 Jan 2025 12:25:03 +0100 Subject: [PATCH 3/5] New test: /Sanity/install-weak-deps --- Sanity/install-weak-deps/main.fmf | 6 +++ Sanity/install-weak-deps/runtest.sh | 43 +++++++++++++++ .../install-weak-deps/trivial-empty-v1.spec | 34 ++++++++++++ .../install-weak-deps/trivial-empty-v2.spec | 52 +++++++++++++++++++ 4 files changed, 135 insertions(+) create mode 100644 Sanity/install-weak-deps/main.fmf create mode 100755 Sanity/install-weak-deps/runtest.sh create mode 100644 Sanity/install-weak-deps/trivial-empty-v1.spec create mode 100644 Sanity/install-weak-deps/trivial-empty-v2.spec diff --git a/Sanity/install-weak-deps/main.fmf b/Sanity/install-weak-deps/main.fmf new file mode 100644 index 0000000..9e4aa46 --- /dev/null +++ b/Sanity/install-weak-deps/main.fmf @@ -0,0 +1,6 @@ +summary: Make sure dnf installs weak dep packages (such as valgrind + valgrind-scripts) +test: ./runtest.sh +framework: beakerlib +require: + - rpm-build + - createrepo diff --git a/Sanity/install-weak-deps/runtest.sh b/Sanity/install-weak-deps/runtest.sh new file mode 100755 index 0000000..62899c6 --- /dev/null +++ b/Sanity/install-weak-deps/runtest.sh @@ -0,0 +1,43 @@ +#!/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 "dnf -y remove trivial-empty\* ||:" + rlRun "rm /etc/yum.repos.d/mytestingrepo.repo ||:" + rlPhaseEnd + + rlPhaseStartTest + rlRun "rpmbuild -ba trivial-empty-v1.spec" + rlRun "rpmbuild -ba trivial-empty-v2.spec" + rlRun "a=$(rpm -E '%_arch')" + rlRun "pushd $HOME/rpmbuild/RPMS/$a" + rlRun "createrepo ." + rlRun "popd" + rlRun "rpm -Uvh $HOME/rpmbuild/RPMS/$a/trivial-empty-1.0-1*" + rlRun "rpm -qa | grep -F trivial-empty-sub" 1 + rlRun "rpm -qa | grep -F trivial-empty-1.0-1" + rlRun "rpm -qa | grep -F trivial-empty-1.0-2" 1 + cat > /etc/yum.repos.d/mytestingrepo.repo < - 1.0-1 +- Initial creation of a trivial RPM with no payload diff --git a/Sanity/install-weak-deps/trivial-empty-v2.spec b/Sanity/install-weak-deps/trivial-empty-v2.spec new file mode 100644 index 0000000..155b79c --- /dev/null +++ b/Sanity/install-weak-deps/trivial-empty-v2.spec @@ -0,0 +1,52 @@ +Name: trivial-empty +Version: 1.0 +Release: 2%{?dist} +Epoch: 1 +Summary: A trivial RPM package with an empty payload + +License: MIT +BuildArch: %_arch + +# Set weak dependency on trivial-empty-sub which is a new subpackage +# introduced within this update +Recommends: trivial-empty-sub = %{epoch}:%{version}-%{release} +# Requires: trivial-empty-sub = %{epoch}:%{version}-%{release} + +# Description of the package +%description +This is a trivial RPM package with no payload. It serves as an example +of how to create an RPM specfile with minimal content. + +%package sub +Summary: A trivial RPM subpackage with an empty payload +# Description for the subpackage +%description sub +This is a subpackage of trivial-empty, with an empty payload. + +# Prep stage: nothing to prepare +%prep +# Empty section + +# Build stage: nothing to build +%build +# Empty section + +# Install stage: nothing to install +%install +# Empty section + +# Files: no files to include +%files +# Empty section + +# Subpackage files: no files to include +%files sub +# Empty section + +# Changelog for the RPM package +%changelog +* Thu Jan 16 2025 Example Maintainer - 1.0-2 +- Initial creation of the trivial RPM with no payload + +* Thu Jan 16 2025 Example Maintainer - 1.0-1 +- Initial creation of a trivial RPM with no payload From 064b95ec271aeca4fb08c764acdf9b4ef300ad32 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Fri, 17 Jan 2025 13:24:25 +0100 Subject: [PATCH 4/5] Sanity/install-weak-deps: Additional check for weak deps --- Sanity/install-weak-deps/runtest.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Sanity/install-weak-deps/runtest.sh b/Sanity/install-weak-deps/runtest.sh index 62899c6..40c5ba9 100755 --- a/Sanity/install-weak-deps/runtest.sh +++ b/Sanity/install-weak-deps/runtest.sh @@ -2,6 +2,8 @@ # vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k . /usr/share/beakerlib/beakerlib.sh || exit 1 +DNFSWITCHES="--disablerepo=\* --enablerepo=mytestingrepo" + rlJournalStart rlPhaseStartSetup rlRun "dnf -y remove trivial-empty\* ||:" @@ -27,13 +29,19 @@ gpgcheck=0 enabled=1 EOF rlRun "cat /etc/yum.repos.d/mytestingrepo.repo" - rlRun "dnf --disablerepo=\* --enablerepo=mytestingrepo clean all" - rlRun "dnf --disablerepo=\* --enablerepo=mytestingrepo -y update trivial-empty" + rlRun "dnf $DNFSWITCHES clean all" + rlRun "dnf $DNFSWITCHES -y update trivial-empty" rlRun "rpm -qa | grep -F trivial-empty-1.0-1" 1 rlRun "rpm -qa | grep -F trivial-empty-1.0-2" - # The gist of this test it so make sure the following + # The gist of this test is to make sure the following # trivial-empty-sub-1.0-2 is now installed as a weak dep rlRun "rpm -qa | grep -F trivial-empty-sub-1.0-2" + # Since it's a weak dep, it should be possible to remove + # trivial-empty-sub now, and the trivial-empty should still + # be installed + rlRun "dnf $DNFSWITCHES remove -y trivial-empty-sub" + rlRun "rpm -qa | grep -F trivial-empty-1.0-2" + rlRun "rpm -qa | grep -F trivial-empty-sub-1.0-2" 1 rlPhaseEnd rlPhaseStartCleanup From d071621a56c9a752d1c5941abed193994860a1be Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Wed, 15 Apr 2026 09:07:57 +0200 Subject: [PATCH 5/5] Drop vim modeline, add rpm --nosignature to override new (and unrelated) default. --- Sanity/install-weak-deps/runtest.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Sanity/install-weak-deps/runtest.sh b/Sanity/install-weak-deps/runtest.sh index 40c5ba9..b952e10 100755 --- a/Sanity/install-weak-deps/runtest.sh +++ b/Sanity/install-weak-deps/runtest.sh @@ -1,5 +1,4 @@ #!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k . /usr/share/beakerlib/beakerlib.sh || exit 1 DNFSWITCHES="--disablerepo=\* --enablerepo=mytestingrepo" @@ -17,7 +16,7 @@ rlJournalStart rlRun "pushd $HOME/rpmbuild/RPMS/$a" rlRun "createrepo ." rlRun "popd" - rlRun "rpm -Uvh $HOME/rpmbuild/RPMS/$a/trivial-empty-1.0-1*" + rlRun "rpm -Uvh --nosignature $HOME/rpmbuild/RPMS/$a/trivial-empty-1.0-1*" rlRun "rpm -qa | grep -F trivial-empty-sub" 1 rlRun "rpm -qa | grep -F trivial-empty-1.0-1" rlRun "rpm -qa | grep -F trivial-empty-1.0-2" 1