diff options
author | Lucas De Marchi <lucas.demarchi@intel.com> | 2015-02-10 22:11:25 -0200 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2015-02-10 22:11:25 -0200 |
commit | 33c1185239148c9cd57378befe563d15564dcc7e (patch) | |
tree | 301ee74987a3ef9347b3be2fd848d0c4eec39513 | |
parent | a1a1369051f7132e3230d69a6a85997f42973c0a (diff) | |
download | kmod-33c1185239148c9cd57378befe563d15564dcc7e.tar.gz |
testsuite: port tests without finit_module() to module-playground
14 files changed, 10 insertions, 14 deletions
diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh index 0fa51ab..46c65ad 100755 --- 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 Binary files differdeleted file mode 100644 index 4eac2a3..0000000 --- a/testsuite/rootfs-pristine/test-modprobe/oldkernel-force/lib/modules/3.3.3/kernel/drivers/input/mouse/psmouse.ko +++ /dev/null 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 a4e7677..ba76e18 100644 --- 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 Binary files differindex 0b13537..7075435 100644 --- 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 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 7ba5711..5476653 100644 --- 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 Binary files differindex bdd0eb5..b09a854 100644 --- 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 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 3cc0512..5554ccc 100644 --- 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 Binary files differdeleted file mode 100644 index 4eac2a3..0000000 --- a/testsuite/rootfs-pristine/test-modprobe/oldkernel/lib/modules/3.3.3/kernel/drivers/input/mouse/psmouse.ko +++ /dev/null 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 a4e7677..ba76e18 100644 --- 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 Binary files differindex 0b13537..7075435 100644 --- 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 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 7ba5711..5476653 100644 --- 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 Binary files differindex bdd0eb5..b09a854 100644 --- 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 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 3cc0512..5554ccc 100644 --- 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 360d0c0..d4bcf1a 100644 --- 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(); |