testsuite: port tests without finit_module() to module-playground

diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh
index 0fa51ab03b1bade562238a757dc87f8be05a9467..46c65ad4a0b83362dc22f4ffd90828f60a74f24c 100755 (executable)
--- a/testsuite/populate-modules.sh
+++ b/testsuite/populate-modules.sh
@@ -28,6 +28,8 @@ map=(
     ["test-modprobe/softdep-loop/lib/modules/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko"
     ["test-modprobe/softdep-loop/lib/modules/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko"
     ["test-modprobe/force/lib/modules/4.4.4/kernel/"]="mod-simple.ko"
+    ["test-modprobe/oldkernel/lib/modules/3.3.3/kernel/"]="mod-simple.ko"
+    ["test-modprobe/oldkernel-force/lib/modules/3.3.3/kernel/"]="mod-simple.ko"
 )
 
 for k in ${!map[@]}; do

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/kernel/drivers/input/mouse/psmouse.ko b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/kernel/drivers/input/mouse/psmouse.ko
deleted file mode 100644 (file)
index 4eac2a3..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/kernel/drivers/input/mouse/psmouse.ko and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.alias b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.alias
index a4e7677090e6487c73f5341f2ab969c4e3f8dac3..ba76e1815af0205c1d4ed0160696e2454deb20a8 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.alias
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.alias
@@ -1,3 +1 @@
 # Aliases extracted from modules themselves.
-alias serio:ty05pr*id*ex* psmouse
-alias serio:ty01pr*id*ex* psmouse

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.alias.bin
index 0b13537105c401379bc57d7871cd3486d3e7cd1a..7075435f6268c4d815aec093d61e26647666ba76 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.alias.bin and b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.alias.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.dep b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.dep
index 7ba57117f330a8043c782c7e06b6bfb8af237fba..54766537fa54181e2196f782b74d2b4da3b88b80 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.dep
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.dep
@@ -1 +1 @@
-kernel/drivers/input/mouse/psmouse.ko:
+kernel/mod-simple.ko:

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.dep.bin
index bdd0eb5fb37bb470d36c28807569a458e5f866d9..b09a85432309c43f99500d6cc3473bcb1ef0a80e 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.dep.bin and b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.dep.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.softdep
index 3cc051267da5c6670897c346f1f6e52d14e244be..5554ccca7f9ea1ab44cafeac31c4995158983689 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.softdep
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/modules.softdep
@@ -1,2 +1 @@
 # Soft dependencies extracted from modules themselves.
-# Copy, with a .conf extension, to /etc/modprobe.d to use it with modprobe.

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/kernel/drivers/input/mouse/psmouse.ko b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/kernel/drivers/input/mouse/psmouse.ko
deleted file mode 100644 (file)
index 4eac2a3..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/kernel/drivers/input/mouse/psmouse.ko and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.alias b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.alias
index a4e7677090e6487c73f5341f2ab969c4e3f8dac3..ba76e1815af0205c1d4ed0160696e2454deb20a8 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.alias
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.alias
@@ -1,3 +1 @@
 # Aliases extracted from modules themselves.
-alias serio:ty05pr*id*ex* psmouse
-alias serio:ty01pr*id*ex* psmouse

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.alias.bin
index 0b13537105c401379bc57d7871cd3486d3e7cd1a..7075435f6268c4d815aec093d61e26647666ba76 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.alias.bin and b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.alias.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.dep b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.dep
index 7ba57117f330a8043c782c7e06b6bfb8af237fba..54766537fa54181e2196f782b74d2b4da3b88b80 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.dep
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.dep
@@ -1 +1 @@
-kernel/drivers/input/mouse/psmouse.ko:
+kernel/mod-simple.ko:

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.dep.bin
index bdd0eb5fb37bb470d36c28807569a458e5f866d9..b09a85432309c43f99500d6cc3473bcb1ef0a80e 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.dep.bin and b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.dep.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.softdep
index 3cc051267da5c6670897c346f1f6e52d14e244be..5554ccca7f9ea1ab44cafeac31c4995158983689 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.softdep
+++ b/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/modules.softdep
@@ -1,2 +1 @@
 # Soft dependencies extracted from modules themselves.
-# Copy, with a .conf extension, to /etc/modprobe.d to use it with modprobe.

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index 360d0c06b30a6ac4f9996043ba64ceb117525eeb..d4bcf1af98bfa5a1e86163c527011c81af92f3a8 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -285,7 +285,7 @@ static noreturn int modprobe_oldkernel(const struct test *t)
        const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
-               "psmouse",
+               "mod-simple",
                NULL,
        };
 
@@ -293,13 +293,13 @@ static noreturn int modprobe_oldkernel(const struct test *t)
        exit(EXIT_FAILURE);
 }
 DEFINE_TEST(modprobe_oldkernel,
-       .description = "check modprobe --force",
+       .description = "check modprobe with kernel without finit_module()",
        .config = {
                [TC_UNAME_R] = "3.3.3",
                [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/oldkernel",
                [TC_INIT_MODULE_RETCODES] = "",
        },
-       .modules_loaded = "psmouse",
+       .modules_loaded = "mod-simple",
        );
 
 static noreturn int modprobe_oldkernel_force(const struct test *t)
@@ -307,7 +307,7 @@ static noreturn int modprobe_oldkernel_force(const struct test *t)
        const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
-               "--force", "psmouse",
+               "--force", "mod-simple",
                NULL,
        };
 
@@ -315,13 +315,13 @@ static noreturn int modprobe_oldkernel_force(const struct test *t)
        exit(EXIT_FAILURE);
 }
 DEFINE_TEST(modprobe_oldkernel_force,
-       .description = "check modprobe --force",
+       .description = "check modprobe --force with kernel without finit_module()",
        .config = {
                [TC_UNAME_R] = "3.3.3",
                [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/oldkernel-force",
                [TC_INIT_MODULE_RETCODES] = "",
        },
-       .modules_loaded = "psmouse",
+       .modules_loaded = "mod-simple",
        );
 
 TESTSUITE_MAIN();