Skip to content

Commit 72af79e

Browse files
committed
Merge: redhat: add more namespace selftests to kernel-modules-internal package
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1016 Upstream Status: RHEL-only JIRA: https://issues.redhat.com/browse/RHEL-95481 As the time of this commit there is no targeted testing in CKI for the namespace subsystem. Two other kselftests are in the process of being enabled: pid_namespace and rlimits. Adding two more, timens and pidfd will allow us to increase targetting CKI testing even further. ARK commit: 1741173e9e03859d5340cfbead46f1acc19e3952 Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/797 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: Jan Stancek <jstancek@redhat.com>
2 parents ebc4b1e + b41d41e commit 72af79e

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
@@ -3200,7 +3200,7 @@ pushd tools/testing/selftests
32003200
export CFLAGS="%{build_cflags}"
32013201
export CXXFLAGS="%{build_cxxflags}"
32023202

3203-
TARGETS="bpf cgroup mm net net/forwarding net/mptcp net/netfilter net/packetdrill tc-testing memfd drivers/net/bonding iommu cachestat pid_namespace rlimits"
3203+
TARGETS="bpf cgroup mm net net/forwarding net/mptcp net/netfilter net/packetdrill tc-testing memfd drivers/net/bonding iommu cachestat pid_namespace rlimits timens pidfd"
32043204
%{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}"
32053205

32063206
# Restore the original level of source fortification
@@ -3626,6 +3626,18 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/pid_namespac
36263626
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/pid_namespace/{} \;
36273627
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/pid_namespace/{} \;
36283628
popd
3629+
# install timens selftests
3630+
pushd tools/testing/selftests/timens
3631+
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/timens/{} \;
3632+
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/timens/{} \;
3633+
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/timens/{} \;
3634+
popd
3635+
# install pidfd selftests
3636+
pushd tools/testing/selftests/pidfd
3637+
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/pidfd/{} \;
3638+
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/pidfd/{} \;
3639+
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/pidfd/{} \;
3640+
popd
36293641
%endif
36303642

36313643
###

0 commit comments

Comments
 (0)