Jan Engelhardt
99a92dd817
- Fix up usrmerge patches to make the feature configurable (boo#1212835) * testsuite-Handle-different-sysconfdir.patch * testsuite-depmod-use-defines-for-the-rootfs-lib_modu.patch * depmod-Introduce-outdir-option.patch * man-depmod.d-Fix-incorrect-usr-lib-search-path.patch * kmod-Add-config-command-to-show-compile-time-configu.patch - Refresh usr-lib-modprobe.patch - Refresh usr-lib-modules.patch - Refresh no-stylesheet-download.patch OBS-URL: https://build.opensuse.org/request/show/1096182 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=217
194 lines
8.2 KiB
Diff
194 lines
8.2 KiB
Diff
From 892c2c451397a4f424196bc57e2536651b0549c3 Mon Sep 17 00:00:00 2001
|
|
From: Emil Velikov <emil.velikov@collabora.com>
|
|
Date: Mon, 6 Feb 2023 14:04:49 +0000
|
|
Subject: [PATCH 7/9] testsuite/depmod: use defines for the rootfs/lib_modules
|
|
|
|
The uname used across the tests is same, so drop "_ORDER" from the macro
|
|
name and use it throughout. Similarly - add respective LIB_MODULES
|
|
defines and use them in the tests.
|
|
|
|
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
|
|
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
|
|
---
|
|
testsuite/test-depmod.c | 50 ++++++++++++++++++++++-------------------
|
|
1 file changed, 27 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c
|
|
index 42878cb4eb22..93606947f18a 100644
|
|
--- a/testsuite/test-depmod.c
|
|
+++ b/testsuite/test-depmod.c
|
|
@@ -25,9 +25,9 @@
|
|
|
|
#include "testsuite.h"
|
|
|
|
-#define MODULES_ORDER_UNAME "4.4.4"
|
|
+#define MODULES_UNAME "4.4.4"
|
|
#define MODULES_ORDER_ROOTFS TESTSUITE_ROOTFS "test-depmod/modules-order-compressed"
|
|
-#define MODULES_ORDER_LIB_MODULES MODULES_ORDER_ROOTFS "/lib/modules/" MODULES_ORDER_UNAME
|
|
+#define MODULES_ORDER_LIB_MODULES MODULES_ORDER_ROOTFS "/lib/modules/" MODULES_UNAME
|
|
static noreturn int depmod_modules_order_for_compressed(const struct test *t)
|
|
{
|
|
const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
|
|
@@ -43,7 +43,7 @@ static noreturn int depmod_modules_order_for_compressed(const struct test *t)
|
|
DEFINE_TEST(depmod_modules_order_for_compressed,
|
|
.description = "check if depmod let aliases in right order when using compressed modules",
|
|
.config = {
|
|
- [TC_UNAME_R] = MODULES_ORDER_UNAME,
|
|
+ [TC_UNAME_R] = MODULES_UNAME,
|
|
[TC_ROOTFS] = MODULES_ORDER_ROOTFS,
|
|
},
|
|
.output = {
|
|
@@ -54,10 +54,9 @@ DEFINE_TEST(depmod_modules_order_for_compressed,
|
|
},
|
|
});
|
|
|
|
-#define MODULES_OUTDIR_UNAME "4.4.4"
|
|
#define MODULES_OUTDIR_ROOTFS TESTSUITE_ROOTFS "test-depmod/modules-outdir"
|
|
-#define MODULES_OUTDIR_LIB_MODULES_OUTPUT MODULES_OUTDIR_ROOTFS "/outdir/lib/modules/" MODULES_OUTDIR_UNAME
|
|
-#define MODULES_OUTDIR_LIB_MODULES_INPUT MODULES_OUTDIR_ROOTFS "/lib/modules/" MODULES_OUTDIR_UNAME
|
|
+#define MODULES_OUTDIR_LIB_MODULES_OUTPUT MODULES_OUTDIR_ROOTFS "/outdir/lib/modules/" MODULES_UNAME
|
|
+#define MODULES_OUTDIR_LIB_MODULES_INPUT MODULES_OUTDIR_ROOTFS "/lib/modules/" MODULES_UNAME
|
|
static noreturn int depmod_modules_outdir(const struct test *t)
|
|
{
|
|
const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
|
|
@@ -74,7 +73,7 @@ static noreturn int depmod_modules_outdir(const struct test *t)
|
|
DEFINE_TEST(depmod_modules_outdir,
|
|
.description = "check if depmod honours the outdir option",
|
|
.config = {
|
|
- [TC_UNAME_R] = MODULES_OUTDIR_UNAME,
|
|
+ [TC_UNAME_R] = MODULES_UNAME,
|
|
[TC_ROOTFS] = MODULES_OUTDIR_ROOTFS,
|
|
},
|
|
.output = {
|
|
@@ -88,6 +87,7 @@ DEFINE_TEST(depmod_modules_outdir,
|
|
});
|
|
|
|
#define SEARCH_ORDER_SIMPLE_ROOTFS TESTSUITE_ROOTFS "test-depmod/search-order-simple"
|
|
+#define SEARCH_ORDER_SIMPLE_LIB_MODULES SEARCH_ORDER_SIMPLE_ROOTFS "/lib/modules/" MODULES_UNAME
|
|
static noreturn int depmod_search_order_simple(const struct test *t)
|
|
{
|
|
const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
|
|
@@ -102,18 +102,19 @@ static noreturn int depmod_search_order_simple(const struct test *t)
|
|
DEFINE_TEST(depmod_search_order_simple,
|
|
.description = "check if depmod honor search order in config",
|
|
.config = {
|
|
- [TC_UNAME_R] = "4.4.4",
|
|
+ [TC_UNAME_R] = MODULES_UNAME,
|
|
[TC_ROOTFS] = SEARCH_ORDER_SIMPLE_ROOTFS,
|
|
},
|
|
.output = {
|
|
.files = (const struct keyval[]) {
|
|
- { SEARCH_ORDER_SIMPLE_ROOTFS "/lib/modules/4.4.4/correct-modules.dep",
|
|
- SEARCH_ORDER_SIMPLE_ROOTFS "/lib/modules/4.4.4/modules.dep" },
|
|
+ { SEARCH_ORDER_SIMPLE_LIB_MODULES "/correct-modules.dep",
|
|
+ SEARCH_ORDER_SIMPLE_LIB_MODULES "/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 "/lib/modules/" MODULES_UNAME
|
|
static noreturn int depmod_search_order_same_prefix(const struct test *t)
|
|
{
|
|
const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
|
|
@@ -128,13 +129,13 @@ static noreturn int depmod_search_order_same_prefix(const struct test *t)
|
|
DEFINE_TEST(depmod_search_order_same_prefix,
|
|
.description = "check if depmod honor search order in config with same prefix",
|
|
.config = {
|
|
- [TC_UNAME_R] = "4.4.4",
|
|
+ [TC_UNAME_R] = MODULES_UNAME,
|
|
[TC_ROOTFS] = SEARCH_ORDER_SAME_PREFIX_ROOTFS,
|
|
},
|
|
.output = {
|
|
.files = (const struct keyval[]) {
|
|
- { SEARCH_ORDER_SAME_PREFIX_ROOTFS "/lib/modules/4.4.4/correct-modules.dep",
|
|
- SEARCH_ORDER_SAME_PREFIX_ROOTFS "/lib/modules/4.4.4/modules.dep" },
|
|
+ { SEARCH_ORDER_SAME_PREFIX_LIB_MODULES "/correct-modules.dep",
|
|
+ SEARCH_ORDER_SAME_PREFIX_LIB_MODULES "/modules.dep" },
|
|
{ }
|
|
},
|
|
});
|
|
@@ -154,7 +155,7 @@ static noreturn int depmod_detect_loop(const struct test *t)
|
|
DEFINE_TEST(depmod_detect_loop,
|
|
.description = "check if depmod detects module loops correctly",
|
|
.config = {
|
|
- [TC_UNAME_R] = "4.4.4",
|
|
+ [TC_UNAME_R] = MODULES_UNAME,
|
|
[TC_ROOTFS] = DETECT_LOOP_ROOTFS,
|
|
},
|
|
.expected_fail = true,
|
|
@@ -163,6 +164,7 @@ DEFINE_TEST(depmod_detect_loop,
|
|
});
|
|
|
|
#define SEARCH_ORDER_EXTERNAL_FIRST_ROOTFS TESTSUITE_ROOTFS "test-depmod/search-order-external-first"
|
|
+#define SEARCH_ORDER_EXTERNAL_FIRST_LIB_MODULES SEARCH_ORDER_EXTERNAL_FIRST_ROOTFS "/lib/modules/" MODULES_UNAME
|
|
static noreturn int depmod_search_order_external_first(const struct test *t)
|
|
{
|
|
const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
|
|
@@ -177,18 +179,19 @@ static noreturn int depmod_search_order_external_first(const struct test *t)
|
|
DEFINE_TEST(depmod_search_order_external_first,
|
|
.description = "check if depmod honor external keyword with higher priority",
|
|
.config = {
|
|
- [TC_UNAME_R] = "4.4.4",
|
|
+ [TC_UNAME_R] = MODULES_UNAME,
|
|
[TC_ROOTFS] = SEARCH_ORDER_EXTERNAL_FIRST_ROOTFS,
|
|
},
|
|
.output = {
|
|
.files = (const struct keyval[]) {
|
|
- { SEARCH_ORDER_EXTERNAL_FIRST_ROOTFS "/lib/modules/4.4.4/correct-modules.dep",
|
|
- SEARCH_ORDER_EXTERNAL_FIRST_ROOTFS "/lib/modules/4.4.4/modules.dep" },
|
|
+ { SEARCH_ORDER_EXTERNAL_FIRST_LIB_MODULES "/correct-modules.dep",
|
|
+ SEARCH_ORDER_EXTERNAL_FIRST_LIB_MODULES "/modules.dep" },
|
|
{ }
|
|
},
|
|
});
|
|
|
|
#define SEARCH_ORDER_EXTERNAL_LAST_ROOTFS TESTSUITE_ROOTFS "test-depmod/search-order-external-last"
|
|
+#define SEARCH_ORDER_EXTERNAL_LAST_LIB_MODULES SEARCH_ORDER_EXTERNAL_LAST_ROOTFS "/lib/modules/" MODULES_UNAME
|
|
static noreturn int depmod_search_order_external_last(const struct test *t)
|
|
{
|
|
const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
|
|
@@ -203,18 +206,19 @@ static noreturn int depmod_search_order_external_last(const struct test *t)
|
|
DEFINE_TEST(depmod_search_order_external_last,
|
|
.description = "check if depmod honor external keyword with lower priority",
|
|
.config = {
|
|
- [TC_UNAME_R] = "4.4.4",
|
|
+ [TC_UNAME_R] = MODULES_UNAME,
|
|
[TC_ROOTFS] = SEARCH_ORDER_EXTERNAL_LAST_ROOTFS,
|
|
},
|
|
.output = {
|
|
.files = (const struct keyval[]) {
|
|
- { SEARCH_ORDER_EXTERNAL_LAST_ROOTFS "/lib/modules/4.4.4/correct-modules.dep",
|
|
- SEARCH_ORDER_EXTERNAL_LAST_ROOTFS "/lib/modules/4.4.4/modules.dep" },
|
|
+ { SEARCH_ORDER_EXTERNAL_LAST_LIB_MODULES "/correct-modules.dep",
|
|
+ SEARCH_ORDER_EXTERNAL_LAST_LIB_MODULES "/modules.dep" },
|
|
{ }
|
|
},
|
|
});
|
|
|
|
#define SEARCH_ORDER_OVERRIDE_ROOTFS TESTSUITE_ROOTFS "test-depmod/search-order-override"
|
|
+#define SEARCH_ORDER_OVERRIDE_LIB_MODULES SEARCH_ORDER_OVERRIDE_ROOTFS "/lib/modules/" MODULES_UNAME
|
|
static noreturn int depmod_search_order_override(const struct test *t)
|
|
{
|
|
const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
|
|
@@ -229,13 +233,13 @@ static noreturn int depmod_search_order_override(const struct test *t)
|
|
DEFINE_TEST(depmod_search_order_override,
|
|
.description = "check if depmod honor override keyword",
|
|
.config = {
|
|
- [TC_UNAME_R] = "4.4.4",
|
|
+ [TC_UNAME_R] = MODULES_UNAME,
|
|
[TC_ROOTFS] = SEARCH_ORDER_OVERRIDE_ROOTFS,
|
|
},
|
|
.output = {
|
|
.files = (const struct keyval[]) {
|
|
- { SEARCH_ORDER_OVERRIDE_ROOTFS "/lib/modules/4.4.4/correct-modules.dep",
|
|
- SEARCH_ORDER_OVERRIDE_ROOTFS "/lib/modules/4.4.4/modules.dep" },
|
|
+ { SEARCH_ORDER_OVERRIDE_LIB_MODULES "/correct-modules.dep",
|
|
+ SEARCH_ORDER_OVERRIDE_LIB_MODULES "/modules.dep" },
|
|
{ }
|
|
},
|
|
});
|
|
--
|
|
2.41.0
|
|
|