File 0004-test-m-flag.patch of Package kmod

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-test-m-flag.patch of Package kmod (Revision b01f2f9044bdcc8c429a9a392742aa72)

Currently displaying revision b01f2f9044bdcc8c429a9a392742aa72 , Show latest

From b73f35ece2e15c94dcab800a890d0c7da341e936 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Fri, 6 Sep 2024 13:22:20 +0200
Subject: [PATCH 4/4] test -m flag

---
 scripts/setup-rootfs.sh |  2 ++
 testsuite/test-depmod.c | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

--- a/testsuite/setup-rootfs.sh
+++ b/testsuite/setup-rootfs.sh
@@ -8,6 +8,7 @@ MODULE_PLAYGROUND=$3
 CONFIG_H=$4
 SYSCONFDIR=$5
 
+EXTRADIR=/eieio
 # create rootfs from rootfs-pristine
 
 create_rootfs() {
@@ -46,6 +47,7 @@ feature_enabled() {
 declare -A map
 map=(
     ["test-depmod/search-order-simple$MODULE_DIRECTORY/4.4.4/kernel/crypto/"]="mod-simple.ko"
+    ["test-depmod/search-order-simple$EXTRADIR/4.4.4/kernel/crypto/"]="mod-simple.ko"
     ["test-depmod/search-order-simple$MODULE_DIRECTORY/4.4.4/updates/"]="mod-simple.ko"
     ["test-depmod/search-order-same-prefix$MODULE_DIRECTORY/4.4.4/foo/"]="mod-simple.ko"
     ["test-depmod/search-order-same-prefix$MODULE_DIRECTORY/4.4.4/foobar/"]="mod-simple.ko"
--- a/testsuite/test-depmod.c
+++ b/testsuite/test-depmod.c
@@ -101,6 +101,36 @@ DEFINE_TEST(depmod_search_order_simple,
 		},
 	});
 
+#define EXTRADIR "/eieio"
+#define SEARCH_ORDER_SIMPLE_ROOTFS_MODDIR TESTSUITE_ROOTFS "test-depmod/search-order-simple"
+#define SEARCH_ORDER_SIMPLE_LIB_MODULES_MODDIR SEARCH_ORDER_SIMPLE_ROOTFS EXTRADIR "/" MODULES_UNAME
+static noreturn int depmod_search_order_simple_moddir(const struct test *t)
+{
+	const char *progname = TOOLS_DIR "/depmod";
+	const char *const args[] = {
+		progname,
+		"-m",
+		EXTRADIR,
+		NULL,
+	};
+
+	test_spawn_prog(progname, args);
+	exit(EXIT_FAILURE);
+}
+DEFINE_TEST(depmod_search_order_simple_moddir,
+	.description = "check -m flag",
+	.config = {
+		[TC_UNAME_R] = MODULES_UNAME,
+		[TC_ROOTFS] = SEARCH_ORDER_SIMPLE_ROOTFS_MODDIR,
+	},
+	.output = {
+		.files = (const struct keyval[]) {
+			{ SEARCH_ORDER_SIMPLE_LIB_MODULES_MODDIR "/correct-modules.dep",
+			  SEARCH_ORDER_SIMPLE_LIB_MODULES_MODDIR "/modules.dep" },
+			{ }
+		},
+	});
+
 #define SEARCH_ORDER_SAME_PREFIX_ROOTFS TESTSUITE_ROOTFS "test-depmod/search-order-same-prefix"
 #define SEARCH_ORDER_SAME_PREFIX_LIB_MODULES SEARCH_ORDER_SAME_PREFIX_ROOTFS MODULE_DIRECTORY "/" MODULES_UNAME
 static noreturn int depmod_search_order_same_prefix(const struct test *t)

Places

File 0004-test-m-flag.patch of Package kmod (Revision b01f2f9044bdcc8c429a9a392742aa72)

Places