Re: [OS-BUILD PATCH] redhat: cleaner kunit tests

[Nico Pache (via Email Bridge)]

From: Nico Pache on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2018#note_1101452297

Ok understandable. The goal was to make maintaining and looking into available
kunit tests easier.

I will resubmit this with just the config changes and follow up with a sort
MR.
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

Re: [OS-BUILD PATCH] redhat: cleaner kunit tests

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2018#note_1098363402

This seems like unnecessary complexity to me. In the end, we are adding spec
complexity and making packagers try to divine the correct place to put a new
module, when it doesn't seem to change anything about the end result
packaging.   I would be okay with a sort on mod-internal.list and start
keeping it sorted with new entries.  I am completely fine with the config
changes though.
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

[OS-BUILD PATCH] redhat: cleaner kunit tests

[Nico Pache (via Email Bridge)]

From: Nico Pache 

redhat: cleaner kunit tests

Group (now sorted!) KUNIT tests into its own file for easier management.

This also required some changes to the SPEC file to append the kunit
tests back onto the mod-internal.list file before generating the image.

Some tests were also forcefully disabled that can run perfectly fine.
Re-enable these tests to increase our testing efforts.

Upstream-status: RHEL-only
Signed-off-by: Nico Pache 

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -512,6 +512,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source 
dist-configs-check
kvm_stat.logrotate \
mod-denylist.sh \
mod-internal.list \
+   mod-kunit.list \
mod-partner.list \
mod-sign.sh \
configs/flavors \
diff --git a/redhat/configs/common/generic/CONFIG_BITS_TEST 
b/redhat/configs/common/generic/CONFIG_BITS_TEST
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_BITS_TEST
+++ b/redhat/configs/common/generic/CONFIG_BITS_TEST
@@ -1 +1 @@
-# CONFIG_BITS_TEST is not set
+CONFIG_BITS_TEST=m
diff --git a/redhat/configs/common/generic/CONFIG_KPROBES_SANITY_TEST 
b/redhat/configs/common/generic/CONFIG_KPROBES_SANITY_TEST
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_KPROBES_SANITY_TEST
+++ b/redhat/configs/common/generic/CONFIG_KPROBES_SANITY_TEST
@@ -1 +1 @@
-# CONFIG_KPROBES_SANITY_TEST is not set
+CONFIG_KPROBES_SANITY_TEST=m
diff --git a/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST 
b/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST
+++ b/redhat/configs/common/generic/CONFIG_RESOURCE_KUNIT_TEST
@@ -1 +1 @@
-# CONFIG_RESOURCE_KUNIT_TEST is not set
+CONFIG_RESOURCE_KUNIT_TEST=m
diff --git a/redhat/configs/ark/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST 
b/redhat/configs/common/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST
rename from redhat/configs/ark/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST
rename to redhat/configs/common/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST
+++ b/redhat/configs/common/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST
diff --git a/redhat/configs/common/generic/CONFIG_TEST_SORT 
b/redhat/configs/common/generic/CONFIG_TEST_SORT
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_TEST_SORT
+++ b/redhat/configs/common/generic/CONFIG_TEST_SORT
@@ -1 +1 @@
-# CONFIG_TEST_SORT is not set
+CONFIG_TEST_SORT=m
diff --git a/redhat/configs/fedora/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST 
b/redhat/configs/fedora/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/CONFIG_SND_SOC_UTILS_KUNIT_TEST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_UTILS_KUNIT_TEST=m
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -817,6 +817,7 @@ Source82: update_scripts.sh
 
 Source84: mod-internal.list
 Source85: mod-partner.list
+Source86: mod-kunit.list
 
 Source100: rheldup3.x509
 Source101: rhelkpatch1.x509
@@ -2077,6 +2078,7 @@ BuildKernel() {
 %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath 
configs/mod-extra.list)
 # Identify modules in the kernel-modules-extras package
 %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
+%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE86} kunit
 %if 0%{!?fedora:1}
 # Identify modules in the kernel-modules-partner package
 %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE85} partner
@@ -2094,6 +2096,7 @@ BuildKernel() {
 mkdir restore
 cp -r lib/modules/$KernelVer/* restore/.
 
+cat mod-kunit.list >> mod-internal.list
 # don't include anything going into kernel-modules-extra in the file lists
 xargs rm -rf < mod-extra.list
 # don't include anything going int kernel-modules-internal in the file 
lists
@@ -2167,6 +2170,7 @@ BuildKernel() {
 rm -f $RPM_BUILD_ROOT/module-dirs.list
 rm -f $RPM_BUILD_ROOT/mod-extra.list
 rm -f $RPM_BUILD_ROOT/mod-internal.list
+rm -f $RPM_BUILD_ROOT/mod-kunit.list
 %if 0%{!?fedora:1}
 rm -f $RPM_BUILD_ROOT/mod-partner.list
 %endif
diff --git a/redhat/mod-internal.list b/redhat/mod-internal.list
index blahblah..blahblah 100644
--- a/redhat/mod-internal.list
+++ b/redhat/mod-internal.list
@@ -1,31 +1,4 @@
 dmatest
-kunit
-kunit-test
-ext4-inode-test
-list-test
-sysctl-test
-mptcp_crypto_test
-mptcp_token_test
-bitfield_kunit
-cmdline_kunit
-property-entry-test
-qos-test
-resource_kunit
-soc-topology-test
-string-stream-test
-test_linear_ranges
-test_bits
-test_kasan
-time_test
-fat_test
-lib_t