testsuite: port show-depends tests to module-playground

Another test, modprobe_show_alias_to_none was wrongly checking the
output in the show-depends namespace so it needed changing as well.
This commit is contained in:
Lucas De Marchi 2015-02-10 09:30:49 -02:00
parent e6307200af
commit eeb627004b
81 changed files with 15 additions and 136 deletions

View File

@ -22,6 +22,9 @@ map=(
["test-dependencies/lib/modules/4.0.20-kmod/kernel/fs/"]="mod-foo.ko"
["test-init/"]="mod-simple.ko"
["test-remove/"]="mod-simple.ko"
["test-modprobe/show-depends/lib/modules/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko"
["test-modprobe/show-depends/lib/modules/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko"
["test-modprobe/show-depends/lib/modules/4.4.4/kernel/mod-simple.ko"]="mod-simple.ko"
)
for k in ${!map[@]}; do

View File

@ -0,0 +1 @@
insmod /lib/modules/4.4.4/kernel/mod-simple.ko

View File

@ -1 +0,0 @@
insmod /lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko

View File

@ -1,2 +1,2 @@
insmod /lib/modules/4.4.4/kernel/net/bluetooth/bluetooth.ko
insmod /lib/modules/4.4.4/kernel/drivers/bluetooth/btusb.ko
insmod /lib/modules/4.4.4/kernel/mod-loop-b.ko
insmod /lib/modules/4.4.4/kernel/mod-loop-a.ko

View File

@ -1,21 +1 @@
# Aliases extracted from modules themselves.
alias usb:v413Cp8197d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v0A5Cp21E3d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v0C10p0000d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v0BDBp1002d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v044Ep3002d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v044Ep3001d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v04BFp030Ad*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v057Cp3800d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v05ACp8281d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v05ACp821Ad*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v05ACp821Fd*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v05ACp821Bd*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v05ACp8218d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v05ACp8215d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v05ACp8213d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v05ACp21E1d*dc*dsc*dp*ic*isc*ip* btusb
alias usb:v*p*d*dcE0dsc01dp01ic*isc*ip* btusb
alias serio:ty05pr*id*ex* psmouse
alias serio:ty01pr*id*ex* psmouse
alias net-pf-31 bluetooth

View File

@ -1,3 +1,3 @@
kernel/drivers/bluetooth/btusb.ko: kernel/net/bluetooth/bluetooth.ko
kernel/drivers/input/mouse/psmouse.ko:
kernel/net/bluetooth/bluetooth.ko:
kernel/mod-simple.ko:
kernel/mod-loop-b.ko:
kernel/mod-loop-a.ko: kernel/mod-loop-b.ko

View File

@ -1,2 +1 @@
# Soft dependencies extracted from modules themselves.
# Copy, with a .conf extension, to /etc/modprobe.d to use it with modprobe.

View File

@ -1,45 +1,3 @@
# Aliases for symbols, used by symbol_request().
alias symbol:hci_conn_check_secure bluetooth
alias symbol:hci_send_acl bluetooth
alias symbol:hci_recv_fragment bluetooth
alias symbol:hci_recv_frame bluetooth
alias symbol:hci_le_ltk_reply bluetooth
alias symbol:hci_send_sco bluetooth
alias symbol:bt_debugfs bluetooth
alias symbol:bt_accept_unlink bluetooth
alias symbol:bt_sock_recvmsg bluetooth
alias symbol:bt_sock_ioctl bluetooth
alias symbol:hci_le_conn_update bluetooth
alias symbol:hci_unregister_cb bluetooth
alias symbol:hci_connect bluetooth
alias symbol:hci_le_start_enc bluetooth
alias symbol:bt_sock_link bluetooth
alias symbol:bt_printk bluetooth
alias symbol:hci_alloc_dev bluetooth
alias symbol:baswap bluetooth
alias symbol:hci_conn_switch_role bluetooth
alias symbol:hci_resume_dev bluetooth
alias symbol:bt_sock_stream_recvmsg bluetooth
alias symbol:hci_conn_check_link_mode bluetooth
alias symbol:hci_conn_hold_device bluetooth
alias symbol:hci_conn_change_link_key bluetooth
alias symbol:hci_conn_put_device bluetooth
alias symbol:batostr bluetooth
alias symbol:bt_to_errno bluetooth
alias symbol:bt_accept_dequeue bluetooth
alias symbol:hci_free_dev bluetooth
alias symbol:bt_accept_enqueue bluetooth
alias symbol:hci_find_link_key_type bluetooth
alias symbol:hci_find_ltk bluetooth
alias symbol:hci_recv_stream_fragment bluetooth
alias symbol:bt_sock_register bluetooth
alias symbol:hci_get_route bluetooth
alias symbol:hci_register_dev bluetooth
alias symbol:hci_unregister_dev bluetooth
alias symbol:bt_sock_poll bluetooth
alias symbol:bt_sock_wait_state bluetooth
alias symbol:bt_sock_unlink bluetooth
alias symbol:bt_sock_unregister bluetooth
alias symbol:hci_register_cb bluetooth
alias symbol:hci_suspend_dev bluetooth
alias symbol:hci_conn_security bluetooth
alias symbol:printB mod_loop_b
alias symbol:printA mod_loop_a

View File

@ -1 +0,0 @@
../../../bus/usb/drivers/btusb

View File

@ -30,7 +30,7 @@ static noreturn int modprobe_show_depends(const struct test *t)
const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
const char *const args[] = {
progname,
"--show-depends", "btusb",
"--show-depends", "mod-loop-a",
NULL,
};
@ -52,7 +52,7 @@ static noreturn int modprobe_show_depends2(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,
};
@ -66,7 +66,7 @@ DEFINE_TEST(modprobe_show_depends2,
[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/show-depends",
},
.output = {
.out = TESTSUITE_ROOTFS "test-modprobe/show-depends/correct-psmouse.txt",
.out = TESTSUITE_ROOTFS "test-modprobe/show-depends/correct-mod-simple.txt",
});
@ -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/show-depends/correct-psmouse.txt",
.out = TESTSUITE_ROOTFS "test-modprobe/alias-to-none/correct-psmouse.txt",
},
.modules_loaded = "",
);