Compare commits

..

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

2
.gitignore vendored

@ -1 +1 @@
SOURCES/rt-tests-2.5.tar.xz SOURCES/rt-tests-2.8.tar.xz

@ -1 +1 @@
0b4143fef6905a83f68b2a53a007708a666a02ec SOURCES/rt-tests-2.5.tar.xz 5d0eed772fbcd6198f45b2746e0a7477366b1984 SOURCES/rt-tests-2.8.tar.xz

@ -0,0 +1,33 @@
From cb0d857539d2fedc31533390021b600edb906352 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@redhat.com>
Date: Wed, 4 Dec 2024 16:40:03 +0100
Subject: [PATCH 1/2] rt-tests: Put variables in test-feature in quotes
test-feature passes several variables (OBJDIR, CFLAGS, CPPFLAGS,
LDFLAGS) to make via a shell command from inside the Makefile. If there
are spaces in either of these, it gets parsed as a second argument
to make and feature detection fails.
Add quotes around the values to prevent them being passed as multiple
arguments.
Signed-off-by: Tomas Glozar <tglozar@redhat.com>
Signed-off-by: John Kacur <jkacur@redhat.com>
---
feature/test-feature.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/feature/test-feature.mak b/feature/test-feature.mak
index 0b3e51c..aef915a 100644
--- a/feature/test-feature.mak
+++ b/feature/test-feature.mak
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
define test-feature
-$(shell $(MAKE) OBJDIR=$(OBJDIR) CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) LDFLAGS=$(LDFLAGS) \
+$(shell $(MAKE) OBJDIR="$(OBJDIR)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
-f feature/Makefile feature-$1 clean >/dev/null 2>/dev/null; echo $$?)
endef
--
2.43.5

@ -0,0 +1,45 @@
From 623f6908ef3bc8367661a2e1440dd8c5bee91397 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@redhat.com>
Date: Wed, 4 Dec 2024 16:40:04 +0100
Subject: [PATCH 2/2] rt-tests: Handle -lcpupower flag outside LDFLAGS
The rt-tests Makefile adds -lcpupower to LDFLAGS if libcpupower support
is detected on the system. However, this does not work when LDFLAGS is
overwritten by an external source.
Add separate variable LIBCPUPOWER to contain the flag and pass it to the
cyclictest linking phase. This also avoids unnecessarily passing the
flag to the linking of other rt-tests binaries which do not use
libcpupower.
Signed-off-by: Tomas Glozar <tglozar@redhat.com>
Signed-off-by: John Kacur <jkacur@redhat.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index f656e34..0fa0928 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ PYLIB ?= $(shell python3 -m get_pylib)
ifneq ($(no_libcpupower), 1)
ifeq ($(call test-feature,libcpupower), 0)
CPPFLAGS += -DHAVE_LIBCPUPOWER_SUPPORT
-LDFLAGS += -lcpupower
+LIBCPUPOWER += -lcpupower
else
$(warning libcpupower is missing, building without --deepest-idle-state support.)
$(warning Please install libcpupower-dev/kernel-tools-libs-devel)
@@ -135,7 +135,7 @@ $(OBJDIR):
-include $(addprefix $(OBJDIR)/,$(sources:.c=.d))
cyclictest: $(OBJDIR)/cyclictest.o $(OBJDIR)/librttest.a $(OBJDIR)/librttestnuma.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(RTTESTNUMA)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(RTTESTNUMA) $(LIBCPUPOWER)
cyclicdeadline: $(OBJDIR)/cyclicdeadline.o $(OBJDIR)/librttest.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
--
2.43.5

@ -1,25 +1,25 @@
Summary: Programs that test various rt-features
Name: realtime-tests Name: realtime-tests
# These will be setup by the "make rpm" logic Summary: Programs that test various rt-features
# Version: 1.0 Version: 2.8
# BuildRequires: numactl-devel Release: 3%{?dist}
# Numa argument to make: NUMA=1 License: GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.1-or-later
#
Version: 2.5
Release: 2%{?dist}
License: GPLv2
URL: https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git URL: https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git
Source0: https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-%{version}.tar.xz Source0: https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-%{version}.tar.xz
ExcludeArch: s390 s390x armv7hl ppc64 ppc64le i686 ExcludeArch: %{arm}
BuildRequires: make BuildRequires: make
BuildRequires: gcc BuildRequires: gcc
BuildRequires: numactl-devel BuildRequires: numactl-devel
BuildRequires: python3-devel BuildRequires: python3-devel
# Architectures we build tools/cpupower on
%ifarch i686 x86_64 ppc64le aarch64
BuildRequires: kernel-tools-libs-devel
%endif
Requires: bash Requires: bash
Requires: bc Requires: bc
#Patches Patch1: 0001-rt-tests-Put-variables-in-test-feature-in-quotes.patch
Patch2: 0002-rt-tests-Handle-lcpupower-flag-outside-LDFLAGS.patch
%description %description
realtime-tests is a set of programs that test and measure various components of realtime-tests is a set of programs that test and measure various components of
@ -27,7 +27,7 @@ real-time kernel behavior. This package measures timer, signal, and hardware
latency. It also tests the functioning of priority-inheritance mutexes. latency. It also tests the functioning of priority-inheritance mutexes.
%prep %prep
%setup -q -n rt-tests-%{version} %autosetup -p1 -n rt-tests-%{version}
%build %build
%set_build_flags %set_build_flags
@ -38,7 +38,7 @@ latency. It also tests the functioning of priority-inheritance mutexes.
%files %files
%pycached %{python3_sitelib}/hwlatdetect.py %pycached %{python3_sitelib}/hwlatdetect.py
%caps(cap_sys_rawio+ep) /usr/bin/cyclictest %caps(cap_sys_rawio+ep) %attr(750,-,-) /usr/bin/cyclictest
%{_bindir}/pi_stress %{_bindir}/pi_stress
%{_bindir}/signaltest %{_bindir}/signaltest
%{_bindir}/hwlatdetect %{_bindir}/hwlatdetect
@ -78,85 +78,104 @@ latency. It also tests the functioning of priority-inheritance mutexes.
%{_mandir}/man8/determine_maximum_mpps.8.* %{_mandir}/man8/determine_maximum_mpps.8.*
%changelog %changelog
* Wed Jul 12 2023 John Kacur <jkacur@redhat.com> - 2.5-2 * Fri Dec 13 2024 Tomas Glozar <tglozar@redhat.com> - 2.8-3
- Remove aarch64 from ExcludeArch to allow internal arm builds - Limit libcpupower dependency to where it is present
Resolves: rhbz#2222437 Resolves: RHEL-65488
* Tue Jan 24 2023 John Kacur <jkacur@redhat.com> - 2.5-1 * Wed Dec 04 2024 Tomas Glozar <tglozar@redhat.com> - 2.8-2
- Update to latest rt-tests upstream v2.5 - Fix building against libcpupower
Resolves: rhbz#2162779 Resolves: RHEL-65488
* Wed Dec 14 2022 Crystal Wood <swood@redhat.com> - 2.4-6 * Fri Nov 29 2024 John Kacur <jkacur@redhat.com> - 2.8-1
- oslat: Add command line option for bucket width - Rebase to rt-tests-2.8 upstream
Resolves: rhbz#2041637 Resolves: RHEL-68659
* Mon Nov 14 2022 Leah Leshchinsky <lleshchi@redhat.com> - 2.4-5 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.7-4
- hwlatdetect: Convert to fstrings - Bump release for October 2024 mass rebuild:
- hwlatdetect: Update to integer division Resolves: RHEL-64018
- hwlatdetect: Fix incorrect comment about test duration
Resolves: rhbz#2121150 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.7-3
- Bump release for June 2024 mass rebuild
* Wed Nov 02 2022 John Kacur <jkacur@redhat.com> - 2.4-4
- Add error checking in hackbench to connect and getsockname * Thu May 23 2024 Anubhav Shelat <ashelat@redhat.com> - 2.7-2
- Fix compile warnings in hackbench because of comparison of different signs - Added patch to fix -s option in hackbench
- Fix compile warnings in hackbench because of warnings about fall through - Added patch to prevent user from erroneously passing negative numbers to hackbench.
Resolves: rhbz#2115067 Resolves: RHEL-36745
* Fri Oct 07 2022 John Kacur <jkacur@redhat.com> - 2.4-3 * Tue May 07 2024 John Kacur <jkacur@redhat.com> - 2.7-1
- Remove arbitrary limits on number of threads - Rebase to upstream rt-tests 2.7
Resolves: rhbz#2129891 Resolves: RHEL-30167
* Tue Jul 12 2022 John Kacur <jkacur@redhat.com> - 2.4-2 * Thu Apr 25 2024 Eder Zulian <ezulian@redhat.com> - 2.6-6
- Add an rpminspect.yaml file - Strip o+rx permissions from the cyclictest executable
Resolves: rhbz#2106464 Resolves: RHEL-34077
* Fri Jul 8 2022 John Kacur <jkacur@redhat.com> - 2.4-1 * Tue Mar 26 2024 John Kacur <jkacur@redhat.com> - 2.6-5
- Update to latest rt-tests upstream v2.4 - Added the following upstream patches
Resolves: rhbz#2068112 rt-tests-Fix-warnings.patch
rt-tests-cyclictest-Remove-histogram-totals.patch
* Fri Feb 4 2022 John Kacur <jkacur@redhat.com> - 2.3-3 rt-tests-cyclictest-Replace-histogram-code-with-libr.patch
- Don't build unsupported i686 rt-tests-cyclicdeadline-Add-histogram-support.patch
Resolves: rhbz#2050375 rt-tests-cyclics-Fix-json-segfault-when-not-using-hi.patch
rt-tests-cyclicdeadline-Print-the-histogram-regardle.patch
* Thu Feb 3 2022 John Kacur <jkacur@redhat.com> - 2.3-2 rt-tests-cyclicdeadline-Remove-dead-verbose-code-in-.patch
- Fix parsing of affinity rt-tests-oslat-should-use-MHz-not-Mhz.patch
- Ignore the runtime cpumask if a new cpumask is requested rt-tests-oslat-convert-to-nanoseconds-correctly.patch
Resolves: rhbz#2050244 - Added gating.yaml
- Added tests dir
* Thu Jan 13 2022 Leah Leshchinsky <lleshchi@redhat.com> - 2.3-1 Resolves: RHEL-30184
- Update to latest upstream 2.3
- Correct the comment of numa_initialize() * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
- oslat.8: Remove the argument of --bias - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
Resolves: rhbz#2012297
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-3
* Thu Nov 18 2021 John Kacur <jkacur@redhat.com> - 2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
- Fix potential double mount of cgroups for deadline_test
- Fix potential double mount of cgroups for cyclicdeadline_test * Wed Dec 06 2023 John Kacur <jkacur@redhat.com> - 2.6-2
Resolves: rhbz#2011415 - Add an rpminspect.yaml file to disaable the badfuncs check
* Thu Nov 18 2021 John Kacur <jkacur@redhat.com> - 2.1-5 * Fri Dec 01 2023 John Kacur <jkacur@redhat.com> - 2.6-1
- Null check to prevent floating point exception in deadline test - Update to latest version upstream v2.6
Resolves: rhbz#2023501 - Include SPDX changes
* Tue Nov 02 2021 Leah Leshchinsky <lleshchi@redhat.com> - 2.1-4 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-3
- Add missing option -F to optstring - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Resolved: rhbz#2007021
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 2.5-2
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.1-3 - Rebuilt for Python 3.12
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 * Tue Feb 14 2023 John Kacur <jkacur@redhat.com> - 2.5-1
- Update to latest upstream
* Fri Jul 23 2021 John Kacur <jkacur@redhat.com> - 2.1-2 - Remove patch included in the update, and add three more
- Take into account the rename of the sched_features file for HRTICK
- Use HRTICK_DL if available * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-2
Resolves: rhbz#1973083 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jun 30 2021 john Kacur <jkacur@redhat.com> - 2.1-1 * Thu Aug 18 2022 John Kacur <jkacur@redhat.com> - 2.4-1
- Update to latest upstream rt-tests-2.1 - Update to latest version upstream
Resolves: rhbz#1890563 - Include upstream patch to fix affinity being set even when -a not set
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.9-10 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.3-3
- Rebuilt for Python 3.11
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Dec 10 2021 John Kacur <jkacur@redhat.com> - 2.3-1
- Update to 2.3
* Tue Oct 26 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.2-1
- Update to 2.2
- Build on all 64 bit arches
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.9-10
- Rebuilt for Python 3.10
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-9 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save