diff options
author | Lucas De Marchi <lucas.demarchi@intel.com> | 2015-02-10 22:01:42 -0200 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2015-02-10 22:01:42 -0200 |
commit | a1a1369051f7132e3230d69a6a85997f42973c0a (patch) | |
tree | 70f5aba505a348dda1513a0aa73cde66909787af | |
parent | 1e128242edb8a3600c671434c5b52a78d86e29c3 (diff) | |
download | kmod-a1a1369051f7132e3230d69a6a85997f42973c0a.tar.gz |
testsuite: port modprobe --force test to module-playground
-rwxr-xr-x | testsuite/populate-modules.sh | 1 | ||||
-rw-r--r-- | testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko | bin | 95649 -> 0 bytes | |||
-rw-r--r-- | testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.alias | 2 | ||||
-rw-r--r-- | testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.alias.bin | bin | 101 -> 12 bytes | |||
-rw-r--r-- | testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.dep | 2 | ||||
-rw-r--r-- | testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.dep.bin | bin | 72 -> 58 bytes | |||
-rw-r--r-- | testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.softdep | 1 | ||||
-rw-r--r-- | testsuite/test-modprobe.c | 4 |
8 files changed, 4 insertions, 6 deletions
diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh index c8dd5c5..0fa51ab 100755 --- a/testsuite/populate-modules.sh +++ b/testsuite/populate-modules.sh @@ -27,6 +27,7 @@ map=( ["test-modprobe/show-depends/lib/modules/4.4.4/kernel/mod-simple.ko"]="mod-simple.ko" ["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" ) for k in ${!map[@]}; do diff --git a/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko b/testsuite/rootfs-pristine/test-modprobe/force/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/force/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko +++ /dev/null diff --git a/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.alias index a4e7677..ba76e18 100644 --- a/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.alias +++ b/testsuite/rootfs-pristine/test-modprobe/force/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/force/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.alias.bin Binary files differindex 0b13537..7075435 100644 --- a/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.alias.bin +++ b/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.alias.bin diff --git a/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.dep index 7ba5711..5476653 100644 --- a/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.dep +++ b/testsuite/rootfs-pristine/test-modprobe/force/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/force/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.dep.bin Binary files differindex bdd0eb5..b09a854 100644 --- a/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.dep.bin +++ b/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.dep.bin diff --git a/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.softdep index 3cc0512..5554ccc 100644 --- a/testsuite/rootfs-pristine/test-modprobe/force/lib/modules/4.4.4/modules.softdep +++ b/testsuite/rootfs-pristine/test-modprobe/force/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/test-modprobe.c b/testsuite/test-modprobe.c index 99fe72c..360d0c0 100644 --- a/testsuite/test-modprobe.c +++ b/testsuite/test-modprobe.c @@ -263,7 +263,7 @@ static noreturn int modprobe_force(const struct test *t) const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe"; const char *const args[] = { progname, - "--force", "psmouse", + "--force", "mod-simple", NULL, }; @@ -277,7 +277,7 @@ DEFINE_TEST(modprobe_force, [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/force", [TC_INIT_MODULE_RETCODES] = "", }, - .modules_loaded = "psmouse", + .modules_loaded = "mod-simple", ); static noreturn int modprobe_oldkernel(const struct test *t) |