Re: [PATCH 3/4] testsuite: fixup KMOD_SYSCONFDIR_NOT_ETC tests

Lucas De Marchi <lucas.demarchi@xxxxxxxxx> · Thu, 9 Feb 2023 11:20:13 -0800

On Thu, Feb 09, 2023 at 07:25:21AM -0800, Lucas De Marchi wrote:
On Mon, Feb 06, 2023 at 02:04:48PM +0000, Emil Velikov wrote:
From: Emil Velikov <emil.velikov@xxxxxxxxxxxxx>

Currently some tests lack a config segment in `.../etc`, yet they're
skipped when KMOD_SYSCONFDIR_NOT_ETC is set. Inversely - some tests have
a config snippet, yet are not skipped.

Go through the lot and fix them all. While there make sure we use tab
for code indentation, as per the style guide.

Signed-off-by: Emil Velikov <emil.velikov@xxxxxxxxxxxxx>

$ cat testsuite/test-depmod.log
depmod: WARNING: could not open modules.order at /lib/modules/4.4.4: No such file or directory
depmod: WARNING: could not open modules.order at /lib/modules/4.4.4: No such file or directory
depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4: No such file or directory
depmod: WARNING: could not open modules.builtin.modinfo at /lib/modules/4.4.4: No such file or directory
depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4: No such file or directory
depmod: WARNING: could not open modules.builtin.modinfo at /lib/modules/4.4.4: No such file or directory
depmod: WARNING: could not open modules.order at /lib/modules/4.4.4: No such file or directory
TESTSUITE: running depmod_search_order_override, in forked context
TESTSUITE: SKIPPED: depmod_search_order_override
TESTSUITE: ------
TESTSUITE: running depmod_search_order_external_last, in forked context
TESTSUITE: SKIPPED: depmod_search_order_external_last
TESTSUITE: ------
TESTSUITE: running depmod_search_order_external_first, in forked context
TESTSUITE: SKIPPED: depmod_search_order_external_first
TESTSUITE: ------
TESTSUITE: running depmod_detect_loop, in forked context
TESTSUITE: 'depmod_detect_loop' [127296] exited with return code 0
TESTSUITE: ERR: UNEXPECTED PASS: exit with 0: depmod_detect_loop
TESTSUITE: ------
depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4: No such file or directory
depmod: WARNING: could not open modules.builtin.modinfo at /lib/modules/4.4.4: No such file or directory
FAIL testsuite/test-depmod (exit status: 1)

I needed this:
----8<-----

diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c
index 2bc2e90..2d55b5d 100644
--- a/testsuite/test-depmod.c
+++ b/testsuite/test-depmod.c
@@ -159,6 +159,9 @@ static noreturn int depmod_detect_loop(const struct test *t)
	exit(EXIT_FAILURE);
}
DEFINE_TEST(depmod_detect_loop,
+#if defined(KMOD_SYSCONFDIR_NOT_ETC)
+	.skip = true,
+#endif
	.description = "check if depmod detects module loops correctly",
	.config = {
		[TC_UNAME_R] = MODULES_UNAME,
----8<-----


ok, I'm going to skip this patch and take the other 3. I solved this
differently, by just making the testsuite compatible with
sysconfdir != /etc. I will send that patch to the mailing list, I'd
appreciate if you could review it.


Applied patches 1, 2 and 4.

thanks
Lucas De Marchi




Lucas De Marchi

---
NOTE: this is based off my earlier patch adding outdir. If this patch is
applied prior the depmod_modules_outdir hunk should be dropped.
---
testsuite/test-blacklist.c  |  2 +-
testsuite/test-depmod.c     | 22 +++++++++++-----------
testsuite/test-modprobe.c   |  7 +++++--
testsuite/test-new-module.c |  3 +++
4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/testsuite/test-blacklist.c b/testsuite/test-blacklist.c
index d03eedb..6531fa2 100644
--- a/testsuite/test-blacklist.c
+++ b/testsuite/test-blacklist.c
@@ -96,7 +96,7 @@ fail_lookup:

DEFINE_TEST(blacklist_1,
#if defined(KMOD_SYSCONFDIR_NOT_ETC)
-        .skip = true,
+	.skip = true,
#endif
	.description = "check if modules are correctly blacklisted",
	.config = {
diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c
index 6465230..010f259 100644
--- a/testsuite/test-depmod.c
+++ b/testsuite/test-depmod.c
@@ -41,9 +41,6 @@ static noreturn int depmod_modules_order_for_compressed(const struct test *t)
}

DEFINE_TEST(depmod_modules_order_for_compressed,
-#if defined(KMOD_SYSCONFDIR_NOT_ETC)
-        .skip = true,
-#endif
	.description = "check if depmod let aliases in right order when using compressed modules",
	.config = {
		[TC_UNAME_R] = MODULES_ORDER_UNAME,
@@ -75,9 +72,6 @@ static noreturn int depmod_modules_outdir(const struct test *t)
}

DEFINE_TEST(depmod_modules_outdir,
-#if defined(KMOD_SYSCONFDIR_NOT_ETC)
-        .skip = true,
-#endif
	.description = "check if depmod honours the outdir option",
	.config = {
		[TC_UNAME_R] = MODULES_OUTDIR_UNAME,
@@ -104,6 +98,9 @@ static noreturn int depmod_search_order_simple(const struct test *t)
	exit(EXIT_FAILURE);
}
DEFINE_TEST(depmod_search_order_simple,
+#if defined(KMOD_SYSCONFDIR_NOT_ETC)
+	.skip = true,
+#endif
	.description = "check if depmod honor search order in config",
	.config = {
		[TC_UNAME_R] = "4.4.4",
@@ -130,6 +127,9 @@ static noreturn int depmod_search_order_same_prefix(const struct test *t)
	exit(EXIT_FAILURE);
}
DEFINE_TEST(depmod_search_order_same_prefix,
+#if defined(KMOD_SYSCONFDIR_NOT_ETC)
+	.skip = true,
+#endif
	.description = "check if depmod honor search order in config with same prefix",
	.config = {
		[TC_UNAME_R] = "4.4.4",
@@ -156,9 +156,6 @@ static noreturn int depmod_detect_loop(const struct test *t)
	exit(EXIT_FAILURE);
}
DEFINE_TEST(depmod_detect_loop,
-#if defined(KMOD_SYSCONFDIR_NOT_ETC)
-        .skip = true,
-#endif
	.description = "check if depmod detects module loops correctly",
	.config = {
		[TC_UNAME_R] = "4.4.4",
@@ -183,7 +180,7 @@ static noreturn int depmod_search_order_external_first(const struct test *t)
}
DEFINE_TEST(depmod_search_order_external_first,
#if defined(KMOD_SYSCONFDIR_NOT_ETC)
-        .skip = true,
+	.skip = true,
#endif
	.description = "check if depmod honor external keyword with higher priority",
	.config = {
@@ -211,6 +208,9 @@ static noreturn int depmod_search_order_external_last(const struct test *t)
	exit(EXIT_FAILURE);
}
DEFINE_TEST(depmod_search_order_external_last,
+#if defined(KMOD_SYSCONFDIR_NOT_ETC)
+	.skip = true,
+#endif
	.description = "check if depmod honor external keyword with lower priority",
	.config = {
		[TC_UNAME_R] = "4.4.4",
@@ -238,7 +238,7 @@ static noreturn int depmod_search_order_override(const struct test *t)
}
DEFINE_TEST(depmod_search_order_override,
#if defined(KMOD_SYSCONFDIR_NOT_ETC)
-        .skip = true,
+	.skip = true,
#endif
	.description = "check if depmod honor override keyword",
	.config = {
diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index 3ddb976..6b763d8 100644
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -84,7 +84,7 @@ static noreturn int modprobe_show_alias_to_none(const struct test *t)
}
DEFINE_TEST(modprobe_show_alias_to_none,
#if defined(KMOD_SYSCONFDIR_NOT_ETC)
-        .skip = true,
+	.skip = true,
#endif
	.description = "check if modprobe --show-depends doesn't explode with an alias to nothing",
	.config = {
@@ -176,7 +176,7 @@ static noreturn int modprobe_softdep_loop(const struct test *t)
}
DEFINE_TEST(modprobe_softdep_loop,
#if defined(KMOD_SYSCONFDIR_NOT_ETC)
-        .skip = true,
+	.skip = true,
#endif
	.description = "check if modprobe breaks softdep loop",
	.config = {
@@ -200,6 +200,9 @@ static noreturn int modprobe_install_cmd_loop(const struct test *t)
	exit(EXIT_FAILURE);
}
DEFINE_TEST(modprobe_install_cmd_loop,
+#if defined(KMOD_SYSCONFDIR_NOT_ETC)
+	.skip = true,
+#endif
	.description = "check if modprobe breaks install-commands loop",
	.config = {
		[TC_UNAME_R] = "4.4.4",
diff --git a/testsuite/test-new-module.c b/testsuite/test-new-module.c
index 9872b78..dcb9934 100644
--- a/testsuite/test-new-module.c
+++ b/testsuite/test-new-module.c
@@ -106,6 +106,9 @@ static int from_alias(const struct test *t)
	return EXIT_SUCCESS;
}
DEFINE_TEST(from_alias,
+#if defined(KMOD_SYSCONFDIR_NOT_ETC)
+	.skip = true,
+#endif
	.description = "check if aliases are parsed correctly",
	.config = {
		[TC_ROOTFS] = TESTSUITE_ROOTFS "test-new-module/from_alias/",
--
2.39.1







