testsuite: move modprobe test into test-modprobe.c

... alongside all the other modprobe tests.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/450
Signed-off-by: Lucas De Marchi <ldemarchi@kernel.org>

diff --git a/testsuite/rootfs-pristine/test-weakdep/modprobe-c.txt b/testsuite/rootfs-pristine/test-modprobe/weakdep-config/correct.txt
similarity index 100%
rename from testsuite/rootfs-pristine/test-weakdep/modprobe-c.txt
rename to testsuite/rootfs-pristine/test-modprobe/weakdep-config/correct.txt

diff --git a/testsuite/rootfs-pristine/test-modprobe/weakdep-config/etc/modprobe.d/dumb-weakdep.conf b/testsuite/rootfs-pristine/test-modprobe/weakdep-config/etc/modprobe.d/dumb-weakdep.conf
new file mode 100644 (file)
index 0000000..6fa8355
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/weakdep-config/etc/modprobe.d/dumb-weakdep.conf
@@ -0,0 +1,2 @@
+weakdep mod-loop-a     
+weakdep mod-loop-b mod-loop-a mod-simple

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

diff --git a/testsuite/rootfs-pristine/test-modprobe/weakdep-config/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/weakdep-config/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/weakdep-config/lib/modules/4.4.4/modules.alias.bin differ

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

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

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

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

diff --git a/testsuite/rootfs-pristine/test-modprobe/weakdep-config/lib/modules/4.4.4/modules.devname b/testsuite/rootfs-pristine/test-modprobe/weakdep-config/lib/modules/4.4.4/modules.devname
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/testsuite/rootfs-pristine/test-modprobe/weakdep-config/lib/modules/4.4.4/modules.symbols b/testsuite/rootfs-pristine/test-modprobe/weakdep-config/lib/modules/4.4.4/modules.symbols
new file mode 100644 (file)
index 0000000..6c53580
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/weakdep-config/lib/modules/4.4.4/modules.symbols
@@ -0,0 +1,3 @@
+# Aliases for symbols, used by symbol_request().
+alias symbol:printB mod_loop_b
+alias symbol:printA mod_loop_a

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

diff --git a/testsuite/rootfs-pristine/test-modprobe/weakdep-config/lib/modules/4.4.4/modules.weakdep b/testsuite/rootfs-pristine/test-modprobe/weakdep-config/lib/modules/4.4.4/modules.weakdep
new file mode 100644 (file)
index 0000000..00777b8
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/weakdep-config/lib/modules/4.4.4/modules.weakdep
@@ -0,0 +1,2 @@
+# Weak dependencies extracted from modules themselves.
+weakdep mod_weakdep mod-simple

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index c15f54424ee578e0d45144a414455ca852bc7f25..86e51ff0441cd2252f0cf4525cc540978788bc33 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -147,6 +147,20 @@ DEFINE_TEST(modprobe_weakdep_loop,
        .modules_not_loaded = "mod-loop-a,mod-simple-c",
        );
 
+static int modprobe_weakdep_config(void)
+{
+       return EXEC_TOOL(modprobe, "-c");
+}
+DEFINE_TEST(modprobe_weakdep_config,
+       .description = "check modprobe config parsing with weakdep",
+       .config = {
+               [TC_UNAME_R] = "4.4.4",
+               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/weakdep-config",
+       },
+       .output = {
+               .out = TESTSUITE_ROOTFS "test-modprobe/weakdep-config/correct.txt",
+       });
+
 static int modprobe_install_cmd_loop(void)
 {
        return EXEC_TOOL(modprobe, "mod-loop-a");

diff --git a/testsuite/test-weakdep.c b/testsuite/test-weakdep.c
index 96a7867aa358593b716c6d7d5cd7fe120a97c32f..7d7d9bab511d1f5afbc095a7dadb519be8e29087 100644 (file)
--- a/testsuite/test-weakdep.c
+++ b/testsuite/test-weakdep.c
@@ -70,18 +70,4 @@ DEFINE_TEST(test_weakdep,
                .out = TESTSUITE_ROOTFS "test-weakdep/correct-weakdep.txt",
        });
 
-static int modprobe_config(void)
-{
-       return EXEC_TOOL(modprobe, "-c");
-}
-DEFINE_TEST(modprobe_config,
-       .description = "check modprobe config parsing with weakdep",
-       .config = {
-               [TC_UNAME_R] = "4.4.4",
-               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-weakdep",
-       },
-       .output = {
-               .out = TESTSUITE_ROOTFS "test-weakdep/modprobe-c.txt",
-       });
-
 TESTSUITE_MAIN();