diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2015-02-11 02:59:08 -0200 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2015-02-11 02:59:08 -0200 |
| commit | 246d67d493510df1547260d968937f4984f148e0 (patch) | |
| tree | 6940319b03d790853ee354374501ec0e4b371f63 | |
| parent | 621ac887e7529026ac588af89896b15be52f3079 (diff) | |
| download | kmod-246d67d493510df1547260d968937f4984f148e0.tar.gz | |
testsuite: port kcmdline test to module-playground
10 files changed, 5 insertions, 7 deletions
diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh index 5a72fe5..447851f 100755 --- 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 cea9626..0d50154 100644 --- 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 Binary files differdeleted file mode 100644 index 4eac2a3..0000000 --- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko +++ /dev/null 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 a4e7677..ba76e18 100644 --- 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 Binary files differindex 0b13537..7075435 100644 --- 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 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 7ba5711..5476653 100644 --- 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 Binary files differindex bdd0eb5..b09a854 100644 --- 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 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 3cc0512..5554ccc 100644 --- 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 31126a9..cd3bacd 100644 --- 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 1ec3487..27edbd0 100644 --- 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, }; |