diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh index 46c65ad..d4b485a 100755 --- a/testsuite/populate-modules.sh +++ b/testsuite/populate-modules.sh @@ -30,6 +30,7 @@ map=( ["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" + ["test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/"]="mod-simple.ko" ) for k in ${!map[@]}; do diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/correct-psmouse.txt b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/correct.txt similarity index 100% rename from testsuite/rootfs-pristine/test-modprobe/alias-to-none/correct-psmouse.txt rename to testsuite/rootfs-pristine/test-modprobe/alias-to-none/correct.txt diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/etc/modprobe.d/bogus.conf b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/etc/modprobe.d/bogus.conf index 14bed0b..fe0d1b4 100644 --- a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/etc/modprobe.d/bogus.conf +++ b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/etc/modprobe.d/bogus.conf @@ -1 +1 @@ -alias psmouse deaddood +alias mod-simple deaddood diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko deleted file mode 100644 index 4eac2a3..0000000 Binary files a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko and /dev/null differ diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias index a4e7677..ba76e18 100644 --- a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias +++ b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/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/alias-to-none/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias.bin index 0b13537..7075435 100644 Binary files a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias.bin and b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias.bin differ diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep index 7ba5711..5476653 100644 --- a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep +++ b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/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/alias-to-none/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep.bin index bdd0eb5..b09a854 100644 Binary files a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep.bin and b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep.bin differ diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.softdep index 3cc0512..5554ccc 100644 --- a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.softdep +++ b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/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 d4bcf1a..8972d98 100644 --- a/testsuite/test-modprobe.c +++ b/testsuite/test-modprobe.c @@ -75,7 +75,7 @@ static noreturn int modprobe_show_alias_to_none(const struct test *t) const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe"; const char *const args[] = { progname, - "--show-depends", "--ignore-install", "--quiet", "psmouse", + "--show-depends", "--ignore-install", "--quiet", "mod-simple", NULL, }; @@ -89,7 +89,7 @@ DEFINE_TEST(modprobe_show_alias_to_none, [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/alias-to-none", }, .output = { - .out = TESTSUITE_ROOTFS "test-modprobe/alias-to-none/correct-psmouse.txt", + .out = TESTSUITE_ROOTFS "test-modprobe/alias-to-none/correct.txt", }, .modules_loaded = "", );