Compare commits

..

No commits in common. "c9-beta" and "c9s" have entirely different histories.
c9-beta ... c9s

11 changed files with 257 additions and 5 deletions

4
.gitignore vendored
View File

@ -1 +1,3 @@
SOURCES/libkdumpfile-0.5.4.tar.gz /libkdumpfile-0.5.2.tar.gz
/libkdumpfile-0.5.4.tar.gz
/libkdumpfile-0.5.5.tar.gz

View File

@ -1 +0,0 @@
193217e1a703afac73f9c9ed99d46a9ae7111df7 SOURCES/libkdumpfile-0.5.4.tar.gz

View File

@ -0,0 +1,48 @@
commit cc927b9e22ebe6de1a6ed23ca8d14d1f3d790fb5
Author: Petr Tesarik <petr@tesarici.cz>
Date: Fri Dec 27 12:17:35 2024 +0100
tests: Fix xlat-linux-x86_64-6.11-pti-user-ver with parallel runs
The xlat-linux-x86_64-6.11-pti-user and xlat-linux-x86_64-6.11-pti-user-ver
test cases use the same input files, but the logic is flawed, because they
also use the same output file names. That fails if both run in parallel.
Fixes: #85
Signed-off-by: Petr Tesarik <petr@tesarici.cz>
diff --git a/tests/xlat-linux-x86_64-6.11-pti-user-ver b/tests/xlat-linux-x86_64-6.11-pti-user-ver
index 43d500d..427985b 100755
--- a/tests/xlat-linux-x86_64-6.11-pti-user-ver
+++ b/tests/xlat-linux-x86_64-6.11-pti-user-ver
@@ -14,5 +14,5 @@ opts=(
osver=0x060b00
)
-name=xlat-linux-x86_64-6.11-pti-user
+srcname=xlat-linux-x86_64-6.11-pti-user
. "$srcdir"/xlat-os-common
diff --git a/tests/xlat-os-common b/tests/xlat-os-common
index a308a74..7dcdee9 100644
--- a/tests/xlat-os-common
+++ b/tests/xlat-os-common
@@ -4,13 +4,14 @@
mkdir -p out || exit 99
-if [ -z "$name" ]; then
- name=$( basename "$0" )
+name=$( basename "$0" )
+if [ -z "$srcname" ]; then
+ srcname="$name"
fi
resultfile="out/${name}.result"
-expectfile="$srcdir/$name.expect"
-symfile="$srcdir/$name.sym"
-datafile="$srcdir/$name.data"
+expectfile="$srcdir/$srcname.expect"
+symfile="$srcdir/$srcname.sym"
+datafile="$srcdir/$srcname.data"
cfgfile="out/${name}.cfg"
optspec=

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1,23 +1,37 @@
%global mainlibsover 10 %if 0%{?fedora} >= 42 || 0%{?rhel} >= 10
# Python bindings removed post-0.5.5
# see commit 40c9ff981f1f3bd968af37a50b50c3478d8267cd
%bcond_with python
%else
%bcond_without python
%endif
%global mainlibsover 12
%global addrlibsover 3 %global addrlibsover 3
Name: libkdumpfile Name: libkdumpfile
Version: 0.5.4 Version: 0.5.5
Release: 1%{?dist} Release: 1%{?dist}
Summary: Kernel coredump file access Summary: Kernel coredump file access
License: LGPL-3.0-or-later OR GPL-2.0-or-later License: LGPL-3.0-or-later OR GPL-2.0-or-later
URL: https://github.com/ptesarik/libkdumpfile URL: https://github.com/ptesarik/libkdumpfile
Source: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz Source: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Patch0: fix_xlat-linux-x86_64-6.11-pti-user-ver_test.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: make BuildRequires: make
BuildRequires: sed BuildRequires: sed
BuildRequires: binutils-devel
BuildRequires: libzstd-devel BuildRequires: libzstd-devel
BuildRequires: lzo-devel BuildRequires: lzo-devel
%if %{with python}
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
%else
Obsoletes: python3-libkdumpfile < 0.5.5-1
%endif
BuildRequires: snappy-devel BuildRequires: snappy-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -50,6 +64,7 @@ Obsoletes: %{name}-doc < 0.5.2-1
The %{name}-doc package contains documentation for %{name}. The %{name}-doc package contains documentation for %{name}.
%if %{with python}
%package -n python3-%{name} %package -n python3-%{name}
Summary: Python bindings for %{name} Summary: Python bindings for %{name}
Obsoletes: %{name}-python < 0.4.0-6 Obsoletes: %{name}-python < 0.4.0-6
@ -60,6 +75,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python3-%{name} %{_description} %description -n python3-%{name} %{_description}
The python3-%{name} package contains Python bindings for %{name}. The python3-%{name} package contains Python bindings for %{name}.
%endif
%package util %package util
Summary: Utilities to read kernel core dumps Summary: Utilities to read kernel core dumps
@ -76,7 +92,12 @@ sed -e "\|#!/usr/bin/env python|d" -i python/*/*.py
%build %build
%configure %configure \
%if %{without python}
--with-python=no \
%endif
%{nil}
%{__make} doxygen-doc %{__make} doxygen-doc
%make_build %make_build
@ -110,19 +131,27 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
%license COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 %license COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
%doc doc/html %doc doc/html
%if %{with python}
%files -n python3-%{name} %files -n python3-%{name}
%{python3_sitearch}/%{name}-%{version}-*.egg-info %{python3_sitearch}/%{name}-%{version}-*.egg-info
%{python3_sitearch}/addrxlat/ %{python3_sitearch}/addrxlat/
%{python3_sitearch}/_addrxlat.*.so %{python3_sitearch}/_addrxlat.*.so
%{python3_sitearch}/kdumpfile/ %{python3_sitearch}/kdumpfile/
%{python3_sitearch}/_kdumpfile.*.so %{python3_sitearch}/_kdumpfile.*.so
%endif
%files util %files util
%{_bindir}/dumpattr %{_bindir}/dumpattr
%{_bindir}/kdumpid
%{_bindir}/listxendoms %{_bindir}/listxendoms
%{_bindir}/showxlat %{_bindir}/showxlat
%{_mandir}/man1/kdumpid.1*
%changelog %changelog
* Fri May 16 2025 Philipp Rudo <prudo@redhat.com> - 0.5.5-1
- Rebase to upstream v0.5.5
Resolves: RHEL-86262
* Tue Nov 12 2024 Philipp Rudo <prudo@redhat.com> - 0.5.4-1 * Tue Nov 12 2024 Philipp Rudo <prudo@redhat.com> - 0.5.4-1
- Rebase to upstream v0.5.4 - Rebase to upstream v0.5.4
Resolves: RHEL-67143 Resolves: RHEL-67143

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (libkdumpfile-0.5.5.tar.gz) = 350f82f1297623f8531f3e1d1f21224d9b4b93d1c90bd4f4c24e792d3cbb02b9b9850d73ca1ade116fe698cfa60d2fdc1b5403f9847f1803c95a9417f854a935

2
tests/README Normal file
View File

@ -0,0 +1,2 @@
initial tests:
run make check, which runs any selftests in the upstream source tarball

64
tests/selftest/Makefile Normal file
View File

@ -0,0 +1,64 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Makefile of /CoreOS/patch/Sanity/selftest
# Description: Executes upstream test suite
# Author: Miroslav Vadkerti <mvadkert@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2010 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing
# to use, modify, copy, or redistribute it subject to the terms
# and conditions of the GNU General Public License version 2.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export TEST=/CoreOS/rng-tools/Sanity/selftest
export TESTVERSION=1.0
BUILT_FILES=
FILES=$(METADATA) runtest.sh Makefile PURPOSE
.PHONY: all install download clean
run: $(FILES) build
./runtest.sh
build: $(BUILT_FILES)
chmod a+x runtest.sh
clean:
rm -f *~ $(BUILT_FILES)
include /usr/share/rhts/lib/rhts-make.include
$(METADATA): Makefile
@echo "Owner: Miroslav Vadkerti <mvadkert@redhat.com>" > $(METADATA)
@echo "Name: $(TEST)" >> $(METADATA)
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
@echo "Path: $(TEST_DIR)" >> $(METADATA)
@echo "Description: Executes upstream test suite" >> $(METADATA)
@echo "Type: Sanity" >> $(METADATA)
@echo "TestTime: 30m" >> $(METADATA)
@echo "RunFor: patch" >> $(METADATA)
@echo "Requires: patch gcc rpm-build automake libselinux-devel ed libattr-devel" >> $(METADATA)
@echo "Priority: Normal" >> $(METADATA)
@echo "License: GPLv2" >> $(METADATA)
@echo "Confidential: no" >> $(METADATA)
@echo "Destructive: no" >> $(METADATA)
@echo "Releases: -RHEL3 -RHEL4 -RHELServer5 -RHELClient5" >> $(METADATA)
rhts-lint $(METADATA)

4
tests/selftest/PURPOSE Normal file
View File

@ -0,0 +1,4 @@
PURPOSE of /CoreOS/irqbalance/Sanity/selftest
Description: Executes rngtest to validate integrity of irqbalance
Author: Neil Horman <nhorman@redhat.com>

74
tests/selftest/runtest.sh Executable file
View File

@ -0,0 +1,74 @@
#!/bin/bash
# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /CoreOS/rng-tools/Sanity/selftest
# Description: Executes the upstream test suite comming with the package
# Author: Miroslav Vadkerti <mvadkert@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2010 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing
# to use, modify, copy, or redistribute it subject to the terms
# and conditions of the GNU General Public License version 2.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Include rhts environment
. /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="libkdumpfile"
PACKAGES="libkdumpfile gcc-c++ doxygen make sed binutils-devel libzstd-devel lzo-devel python3-devel python3-setuptools snappy-devel zlib-devel rpm-build"
UPSTREAMPKG="libkdumpfile-*"
BUILDLOG=`mktemp`
TESTLOG=`mktemp`
TARGET=$(echo `uname -m` | egrep ppc)
if [[ $TARGET != "" ]]; then TARGET="--target `uname -m`"; fi
TOPDIR=`mktemp -d`
SPEC="$TOPDIR/SPECS/$PACKAGE*.spec"
TESTDIR="$TOPDIR/BUILD/$UPSTREAMPKG/"
rlJournalStart
rlPhaseStartSetup
for PKG in $PACKAGES; do
rlAssertRpm $PKG
done
rlPhaseEnd
rlPhaseStartTest
rlFetchSrcForInstalled $PACKAGE
rlRun "rpm -ivh --define '_topdir $TOPDIR' $PACKAGE*.src.rpm" 0 "Installing $PACKAGE src rpm"
echo "+ Building $PACKAGE (Log: $BUILDLOG)"
echo "+ Build command: rpmbuild -bc $SPEC $TARGET"
rlRun "rpmbuild --define '_package_note_flags %nil' --define '_topdir $TOPDIR' -bc $SPEC $TARGET &> $BUILDLOG"
echo "+ Buildlog:"
tail -n 100 $BUILDLOG
rlRun "pushd ."
rlRun "cd $(ls -d $TESTDIR | grep -v SPEC)"
rlRun "make check &> $TESTLOG"
if [ $? -eq 0 ]
then
rlPass "Selftest Passed"
else
rlFail "Selftest Failed"
fi
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -rf $PACKAGE*.src.rpm" 0 "Removing source rpm"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd

23
tests/tests.yml Normal file
View File

@ -0,0 +1,23 @@
---
# This first play always runs on the local staging system
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- classic
tests:
- selftest
required_packages:
- libkdumpfile
- gcc-c++
- doxygen
- make
- sed
- binutils-devel
- libzstd-devel
- lzo-devel
- python3-devel
- python3-setuptools
- snappy-devel
- zlib-devel
- rpm-build