testsuite: modprobe: Add --force-{vermagic,modversion} tests

We don't have any moversion/vermagic tests. This patch add testsuite
--force-{vermagic,modversion} for modprobe.

Link: https://github.com/kmod-project/kmod/pull/344
Signed-off-by: Rong Tao <rongtao@cestc.cn>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>

diff --git a/scripts/setup-rootfs.sh b/scripts/setup-rootfs.sh
index 4bfbcf330fff1c680abe497c2f5d2b09b0526c55..524defa28619de18d8ec33c9f941cabc2b54d746 100755 (executable)
--- a/scripts/setup-rootfs.sh
+++ b/scripts/setup-rootfs.sh
@@ -90,8 +90,12 @@ map=(
     ["test-modprobe/install-cmd-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko"
     ["test-modprobe/install-cmd-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko"
     ["test-modprobe/force$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko"
+    ["test-modprobe/force-modversion$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko"
+    ["test-modprobe/force-vermagic$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko"
     ["test-modprobe/oldkernel$MODULE_DIRECTORY/3.3.3/kernel/"]="mod-simple.ko"
     ["test-modprobe/oldkernel-force$MODULE_DIRECTORY/3.3.3/kernel/"]="mod-simple.ko"
+    ["test-modprobe/oldkernel-force-modversion$MODULE_DIRECTORY/3.3.3/kernel/"]="mod-simple.ko"
+    ["test-modprobe/oldkernel-force-vermagic$MODULE_DIRECTORY/3.3.3/kernel/"]="mod-simple.ko"
     ["test-modprobe/alias-to-none$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko"
     ["test-modprobe/module-param-kcmdline$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko"
     ["test-modprobe/external/lib/modules/external/"]="mod-simple.ko"

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.alias
new file mode 100644 (file)
index 0000000..ba76e18
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.alias
@@ -0,0 +1 @@
+# Aliases extracted from modules themselves.

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.alias.bin
new file mode 100644 (file)
index 0000000..7075435
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.alias.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.builtin.bin b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.builtin.bin
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.dep
new file mode 100644 (file)
index 0000000..5476653
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.dep
@@ -0,0 +1 @@
+kernel/mod-simple.ko:

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.dep.bin
new file mode 100644 (file)
index 0000000..b09a854
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.dep.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.devname b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.devname
new file mode 100644 (file)
index 0000000..58f6d6d
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.devname
@@ -0,0 +1 @@
+# Device nodes to trigger on-demand module loading.

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.softdep
new file mode 100644 (file)
index 0000000..5554ccc
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.softdep
@@ -0,0 +1 @@
+# Soft dependencies extracted from modules themselves.

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.symbols b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.symbols
new file mode 100644 (file)
index 0000000..618c345
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.symbols
@@ -0,0 +1 @@
+# Aliases for symbols, used by symbol_request().

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.symbols.bin b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.symbols.bin
new file mode 100644 (file)
index 0000000..7075435
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/force-modversion/lib/modules/4.4.4/modules.symbols.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-modversion/proc/modules b/testsuite/rootfs-pristine/test-modprobe/force-modversion/proc/modules
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.alias
new file mode 100644 (file)
index 0000000..ba76e18
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.alias
@@ -0,0 +1 @@
+# Aliases extracted from modules themselves.

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.alias.bin
new file mode 100644 (file)
index 0000000..7075435
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.alias.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.builtin.bin b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.builtin.bin
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.dep
new file mode 100644 (file)
index 0000000..5476653
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.dep
@@ -0,0 +1 @@
+kernel/mod-simple.ko:

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.dep.bin
new file mode 100644 (file)
index 0000000..b09a854
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.dep.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.devname b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.devname
new file mode 100644 (file)
index 0000000..58f6d6d
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.devname
@@ -0,0 +1 @@
+# Device nodes to trigger on-demand module loading.

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.softdep
new file mode 100644 (file)
index 0000000..5554ccc
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.softdep
@@ -0,0 +1 @@
+# Soft dependencies extracted from modules themselves.

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.symbols b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.symbols
new file mode 100644 (file)
index 0000000..618c345
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.symbols
@@ -0,0 +1 @@
+# Aliases for symbols, used by symbol_request().

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.symbols.bin b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.symbols.bin
new file mode 100644 (file)
index 0000000..7075435
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/lib/modules/4.4.4/modules.symbols.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/force-vermagic/proc/modules b/testsuite/rootfs-pristine/test-modprobe/force-vermagic/proc/modules
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.alias b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.alias
new file mode 100644 (file)
index 0000000..ba76e18
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.alias
@@ -0,0 +1 @@
+# Aliases extracted from modules themselves.

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.alias.bin
new file mode 100644 (file)
index 0000000..7075435
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.alias.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.builtin.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.builtin.bin
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.dep b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.dep
new file mode 100644 (file)
index 0000000..5476653
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.dep
@@ -0,0 +1 @@
+kernel/mod-simple.ko:

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.dep.bin
new file mode 100644 (file)
index 0000000..b09a854
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.dep.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.devname b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.devname
new file mode 100644 (file)
index 0000000..58f6d6d
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.devname
@@ -0,0 +1 @@
+# Device nodes to trigger on-demand module loading.

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.softdep
new file mode 100644 (file)
index 0000000..5554ccc
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.softdep
@@ -0,0 +1 @@
+# Soft dependencies extracted from modules themselves.

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.symbols b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.symbols
new file mode 100644 (file)
index 0000000..618c345
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.symbols
@@ -0,0 +1 @@
+# Aliases for symbols, used by symbol_request().

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.symbols.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.symbols.bin
new file mode 100644 (file)
index 0000000..7075435
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/lib/modules/3.3.3/modules.symbols.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/proc/modules b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-modversion/proc/modules
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.alias b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.alias
new file mode 100644 (file)
index 0000000..ba76e18
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.alias
@@ -0,0 +1 @@
+# Aliases extracted from modules themselves.

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.alias.bin
new file mode 100644 (file)
index 0000000..7075435
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.alias.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.builtin.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.builtin.bin
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.dep b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.dep
new file mode 100644 (file)
index 0000000..5476653
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.dep
@@ -0,0 +1 @@
+kernel/mod-simple.ko:

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.dep.bin
new file mode 100644 (file)
index 0000000..b09a854
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.dep.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.devname b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.devname
new file mode 100644 (file)
index 0000000..58f6d6d
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.devname
@@ -0,0 +1 @@
+# Device nodes to trigger on-demand module loading.

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.softdep
new file mode 100644 (file)
index 0000000..5554ccc
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.softdep
@@ -0,0 +1 @@
+# Soft dependencies extracted from modules themselves.

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.symbols b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.symbols
new file mode 100644 (file)
index 0000000..618c345
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.symbols
@@ -0,0 +1 @@
+# Aliases for symbols, used by symbol_request().

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.symbols.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.symbols.bin
new file mode 100644 (file)
index 0000000..7075435
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/lib/modules/3.3.3/modules.symbols.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/proc/modules b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force-vermagic/proc/modules
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index 7a9aaedd299056aced8abab922d76ed30038b996..586f7bbc6c67f7b182ffcbca54b5cc429d8aa9fb 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -281,6 +281,36 @@ DEFINE_TEST(modprobe_force,
        .modules_loaded = "mod-simple",
        );
 
+static noreturn int modprobe_force_modversion(const struct test *t)
+{
+       EXEC_MODPROBE("--force-modversion", "mod-simple");
+       exit(EXIT_FAILURE);
+}
+DEFINE_TEST(modprobe_force_modversion,
+       .description = "check modprobe --force-modversion",
+       .config = {
+               [TC_UNAME_R] = "4.4.4",
+               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/force-modversion",
+               [TC_INIT_MODULE_RETCODES] = "",
+       },
+       .modules_loaded = "mod-simple",
+       );
+
+static noreturn int modprobe_force_vermagic(const struct test *t)
+{
+       EXEC_MODPROBE("--force-vermagic", "mod-simple");
+       exit(EXIT_FAILURE);
+}
+DEFINE_TEST(modprobe_force_vermagic,
+       .description = "check modprobe --force-vermagic",
+       .config = {
+               [TC_UNAME_R] = "4.4.4",
+               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/force-vermagic",
+               [TC_INIT_MODULE_RETCODES] = "",
+       },
+       .modules_loaded = "mod-simple",
+       );
+
 static noreturn int modprobe_oldkernel(const struct test *t)
 {
        EXEC_MODPROBE("mod-simple");
@@ -311,6 +341,36 @@ DEFINE_TEST(modprobe_oldkernel_force,
        .modules_loaded = "mod-simple",
        );
 
+static noreturn int modprobe_oldkernel_force_modversion(const struct test *t)
+{
+       EXEC_MODPROBE("--force-modversion", "mod-simple");
+       exit(EXIT_FAILURE);
+}
+DEFINE_TEST(modprobe_oldkernel_force_modversion,
+       .description = "check modprobe --force-modversion with kernel without finit_module()",
+       .config = {
+               [TC_UNAME_R] = "3.3.3",
+               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/oldkernel-force-modversion",
+               [TC_INIT_MODULE_RETCODES] = "",
+       },
+       .modules_loaded = "mod-simple",
+       );
+
+static noreturn int modprobe_oldkernel_force_vermagic(const struct test *t)
+{
+       EXEC_MODPROBE("--force-vermagic", "mod-simple");
+       exit(EXIT_FAILURE);
+}
+DEFINE_TEST(modprobe_oldkernel_force_vermagic,
+       .description = "check modprobe --force-vermagic with kernel without finit_module()",
+       .config = {
+               [TC_UNAME_R] = "3.3.3",
+               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/oldkernel-force-vermagic",
+               [TC_INIT_MODULE_RETCODES] = "",
+       },
+       .modules_loaded = "mod-simple",
+       );
+
 static noreturn int modprobe_external(const struct test *t)
 {
        EXEC_MODPROBE("mod-simple");