Skip to content

Commit c44bdb2

Browse files
author
CKI KWF Bot
committed
Merge: redhat: add namespace selftests to kernel-modules-internal package
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/797 Upstream Status: RHEL-only JIRA: https://issues.redhat.com/browse/RHEL-88630 As the time of this commit there is no targeted testing in CKI for the namespace subsystem. The addition of the two extant namespace kselftests to CKI will pave the way for us to trigger these tests when the underlying tested files are modified. ARK commit: 7b0f1413963a9ecf7c46a9989cd86e12497d8767 Signed-off-by: Joel Savitz <jsavitz@redhat.com> Approved-by: Jan Stancek <jstancek@redhat.com> Approved-by: Herton R. Krzesinski <herton@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 12120ff + 0568128 commit c44bdb2

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

redhat/kernel.spec.template

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3197,7 +3197,7 @@ pushd tools/testing/selftests
31973197
%undefine _fortify_level
31983198
export CFLAGS="%{build_cflags}"
31993199

3200-
TARGETS="bpf cgroup mm net net/forwarding net/mptcp net/netfilter net/packetdrill tc-testing memfd drivers/net/bonding iommu cachestat"
3200+
TARGETS="bpf cgroup mm net net/forwarding net/mptcp net/netfilter net/packetdrill tc-testing memfd drivers/net/bonding iommu cachestat pid_namespace rlimits"
32013201
%{make} %{?_smp_mflags} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" ARCH=$Arch V=1 TARGETS="$TARGETS" SKIP_TARGETS="" $force_targets VMLINUX_H="${RPM_VMLINUX_H}"
32023202

32033203
# Restore the original level of source fortification
@@ -3610,6 +3610,18 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/iommu/{} \;
36103610
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/iommu/{} \;
36113611
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/iommu/{} \;
36123612
popd
3613+
# install rlimits selftests
3614+
pushd tools/testing/selftests/rlimits
3615+
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/rlimits/{} \;
3616+
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/rlimits/{} \;
3617+
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/rlimits/{} \;
3618+
popd
3619+
# install pid_namespace selftests
3620+
pushd tools/testing/selftests/pid_namespace
3621+
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/pid_namespace/{} \;
3622+
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/pid_namespace/{} \;
3623+
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/pid_namespace/{} \;
3624+
popd
36133625
%endif
36143626

36153627
###

0 commit comments

Comments
 (0)