testsuite: port kcmdline test to module-playground

diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh
index 5a72fe529e3dab8f8a37f281ae6129bc7e3603dd..447851fd71906d1c547a70739ad42ab58fc7ac6c 100755 (executable)
--- a/testsuite/populate-modules.sh
+++ b/testsuite/populate-modules.sh
@@ -33,6 +33,7 @@ map=(
     ["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"
     ["test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/"]="mod-simple.ko"
+    ["test-modprobe/module-param-kcmdline/lib/modules/4.4.4/kernel/"]="mod-simple.ko"
 )
 
 for k in ${!map[@]}; do

diff --git a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/correct.txt b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/correct.txt
index cea962693e8499a330bd9c47948403ab903ec1ef..0d501540cd1996b7a9f8c2ae6ba8fbf465920e99 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/correct.txt
+++ b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/correct.txt
@@ -1 +1 @@
-insmod /lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko foo bar=1 
+insmod /lib/modules/4.4.4/kernel/mod-simple.ko foo bar=1 

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

diff --git a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/modules.alias
index a4e7677090e6487c73f5341f2ab969c4e3f8dac3..ba76e1815af0205c1d4ed0160696e2454deb20a8 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/modules.alias
+++ b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/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/module-param-kcmdline/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/modules.alias.bin
index 0b13537105c401379bc57d7871cd3486d3e7cd1a..7075435f6268c4d815aec093d61e26647666ba76 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/modules.alias.bin and b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/modules.alias.bin differ

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

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

diff --git a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/modules.softdep
index 3cc051267da5c6670897c346f1f6e52d14e244be..5554ccca7f9ea1ab44cafeac31c4995158983689 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/modules.softdep
+++ b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/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/module-param-kcmdline/proc/cmdline b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/proc/cmdline
index 31126a9712fa04e6372791f3bb6fa99477fa1350..cd3bacd209fc89a1e38ebefe2941fe50052e1cee 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/proc/cmdline
+++ b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/proc/cmdline
@@ -1 +1 @@
-initrd=\initramfs-linux.img psmouse.foo psmouse.bar=1 root=/dev/sda2 rootfstype=ext4 add_efi_memmap quiet rw
+initrd=\initramfs-linux.img mod_simple.foo mod_simple.bar=1 root=/dev/sda2 rootfstype=ext4 add_efi_memmap quiet rw

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index 1ec34879bcbcba02069c73a5513eb551eb179846..27edbd0810722aa513fd319e4ae2f98ae7ffe62a 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -167,7 +167,7 @@ static noreturn int modprobe_param_kcmdline(const struct test *t)
        const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
-               "--show-depends", "psmouse",
+               "--show-depends", "mod-simple",
                NULL,
        };