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.

diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh
index f41501dc0512fcab6ba42a8bddbc688c03e05e16..bef3db1d2cafd6efacd7e7e549f1f22989a25015 100755 (executable)
--- a/testsuite/populate-modules.sh
+++ b/testsuite/populate-modules.sh
@@ -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

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/correct-mod-simple.txt b/testsuite/rootfs-pristine/test-modprobe/show-depends/correct-mod-simple.txt
new file mode 100644 (file)
index 0000000..5426b9b
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-modprobe/show-depends/correct-mod-simple.txt
@@ -0,0 +1 @@
+insmod /lib/modules/4.4.4/kernel/mod-simple.ko 

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/correct-psmouse.txt b/testsuite/rootfs-pristine/test-modprobe/show-depends/correct-psmouse.txt
deleted file mode 100644 (file)
index 1e773d7..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/correct-psmouse.txt
+++ /dev/null
@@ -1 +0,0 @@
-insmod /lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko 

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/correct.txt b/testsuite/rootfs-pristine/test-modprobe/show-depends/correct.txt
index 52fddba3937b1b95a256be5d5d866bb713d95e2f..38d6d97b8fa7d0045dfea417a42a13667265966e 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/correct.txt
+++ b/testsuite/rootfs-pristine/test-modprobe/show-depends/correct.txt
@@ -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 

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/kernel/drivers/bluetooth/btusb.ko b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/kernel/drivers/bluetooth/btusb.ko
deleted file mode 100644 (file)
index f4e21e0..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/kernel/drivers/bluetooth/btusb.ko and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko
deleted file mode 100644 (file)
index 4eac2a3..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/kernel/net/bluetooth/bluetooth.ko b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/kernel/net/bluetooth/bluetooth.ko
deleted file mode 100644 (file)
index a8949a6..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/kernel/net/bluetooth/bluetooth.ko and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.alias
index 94804f1036295b5449b9412883ee776d6ce66505..ba76e1815af0205c1d4ed0160696e2454deb20a8 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.alias
+++ b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.alias
@@ -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

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.alias.bin
index 86481a4287d0572bff4183103b9df304f647dfe4..7075435f6268c4d815aec093d61e26647666ba76 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.alias.bin and b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.alias.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/holders/.gitignore b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.builtin.bin
similarity index 100%
rename from testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/holders/.gitignore
rename to testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.builtin.bin

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.dep
index a34af87a216f0ea2eb3ebc1f5dc446746de0b355..f166f665d64c7a3acaf0dc1e24a2fb46d50d6c9e 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.dep
+++ b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.dep
@@ -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

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.dep.bin
index 338270636bb7448c9faea63e38bb004d226ee376..418d5839a88c95cb08ed24e128ffdb8717ca1504 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.dep.bin and b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.dep.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.softdep
index 3cc051267da5c6670897c346f1f6e52d14e244be..5554ccca7f9ea1ab44cafeac31c4995158983689 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.softdep
+++ b/testsuite/rootfs-pristine/test-modprobe/show-depends/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/show-depends/lib/modules/4.4.4/modules.symbols b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.symbols
index b970b60d9966c7a1a8921b153b4a8f17c358f995..6c535800518432faff0fcb1736d936d28c7cee3a 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.symbols
+++ b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.symbols
@@ -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

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.symbols.bin b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.symbols.bin
index 156a61fadcf6ccc47ee2755acb084683dd83d560..27c5f4330c93722f6bab5c7a91601ab58fdda577 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.symbols.bin and b/testsuite/rootfs-pristine/test-modprobe/show-depends/lib/modules/4.4.4/modules.symbols.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/coresize b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/coresize
deleted file mode 100644 (file)
index 8bc1425..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/coresize
+++ /dev/null
@@ -1 +0,0 @@
-173424

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/holders/btusb b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/holders/btusb
deleted file mode 120000 (symlink)
index 8fe6aa9..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/holders/btusb
+++ /dev/null
@@ -1 +0,0 @@
-../../btusb
\ No newline at end of file

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/initsize b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/initsize
deleted file mode 100644 (file)
index 573541a..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/initsize
+++ /dev/null
@@ -1 +0,0 @@
-0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/notes/.note.gnu.build-id b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/notes/.note.gnu.build-id
deleted file mode 100644 (file)
index e917247..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/notes/.note.gnu.build-id and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/disable_ertm b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/disable_ertm
deleted file mode 100644 (file)
index d52e798..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/disable_ertm
+++ /dev/null
@@ -1 +0,0 @@
-N

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/disable_esco b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/disable_esco
deleted file mode 100644 (file)
index d52e798..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/disable_esco
+++ /dev/null
@@ -1 +0,0 @@
-N

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/enable_hs b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/enable_hs
deleted file mode 100644 (file)
index d52e798..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/enable_hs
+++ /dev/null
@@ -1 +0,0 @@
-N

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/enable_le b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/enable_le
deleted file mode 100644 (file)
index d52e798..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/enable_le
+++ /dev/null
@@ -1 +0,0 @@
-N

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/enable_mgmt b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/enable_mgmt
deleted file mode 100644 (file)
index d52e798..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/parameters/enable_mgmt
+++ /dev/null
@@ -1 +0,0 @@
-N

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/refcnt b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/refcnt
deleted file mode 100644 (file)
index d00491f..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/refcnt
+++ /dev/null
@@ -1 +0,0 @@
-1

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.bss b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.bss
deleted file mode 100644 (file)
index ea8c54e..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.bss
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0063fe0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.data b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.data
deleted file mode 100644 (file)
index a6f2254..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.data
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0063360

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.exit.text b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.exit.text
deleted file mode 100644 (file)
index 86d3cd1..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.exit.text
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0060c32

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.gnu.linkonce.this_module b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.gnu.linkonce.this_module
deleted file mode 100644 (file)
index 50a1575..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.gnu.linkonce.this_module
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0063da0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.init.text b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.init.text
deleted file mode 100644 (file)
index 921b9d9..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.init.text
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0076000

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.note.gnu.build-id b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.note.gnu.build-id
deleted file mode 100644 (file)
index 8a4d2ce..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.note.gnu.build-id
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0060c98

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.rodata b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.rodata
deleted file mode 100644 (file)
index 24af87e..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.rodata
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00610e0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.rodata.str1.1 b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.rodata.str1.1
deleted file mode 100644 (file)
index 0da8d6d..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.rodata.str1.1
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0062674

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.rodata.str1.8 b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.rodata.str1.8
deleted file mode 100644 (file)
index 3c0aeba..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.rodata.str1.8
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0062af0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.smp_locks b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.smp_locks
deleted file mode 100644 (file)
index d1da04c..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.smp_locks
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00620cc

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.strtab b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.strtab
deleted file mode 100644 (file)
index 3e03a95..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.strtab
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa007b280

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.symtab b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.symtab
deleted file mode 100644 (file)
index 9875bb4..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.symtab
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0076300

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.text b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.text
deleted file mode 100644 (file)
index db229db..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.text
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0040000

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.text.unlikely b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.text.unlikely
deleted file mode 100644 (file)
index 4d8920f..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/.text.unlikely
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0060c2c

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__bug_table b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__bug_table
deleted file mode 100644 (file)
index 07fd388..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__bug_table
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0062ac6

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__jump_table b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__jump_table
deleted file mode 100644 (file)
index ff0edf6..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__jump_table
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0063d10

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__kcrctab b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__kcrctab
deleted file mode 100644 (file)
index 8542e00..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__kcrctab
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0060f80

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__kcrctab_gpl b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__kcrctab_gpl
deleted file mode 100644 (file)
index aaa4573..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__kcrctab_gpl
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00610d8

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__ksymtab b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__ksymtab
deleted file mode 100644 (file)
index a81db94..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__ksymtab
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0060cc0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__ksymtab_gpl b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__ksymtab_gpl
deleted file mode 100644 (file)
index 4d4c450..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__ksymtab_gpl
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0060f70

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__ksymtab_strings b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__ksymtab_strings
deleted file mode 100644 (file)
index 5290e4c..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__ksymtab_strings
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa0062fe4

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__param b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__param
deleted file mode 100644 (file)
index 5d4be39..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/sections/__param
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00632c0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/srcversion b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/srcversion
deleted file mode 100644 (file)
index 64bc12e..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/srcversion
+++ /dev/null
@@ -1 +0,0 @@
-72F6D42DC4BD163E7718A31

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/taint b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/taint
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/taint
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/version b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/version
deleted file mode 100644 (file)
index 6d28a11..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/version
+++ /dev/null
@@ -1 +0,0 @@
-2.16

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/coresize b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/coresize
deleted file mode 100644 (file)
index 4b104f9..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/coresize
+++ /dev/null
@@ -1 +0,0 @@
-11911

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/drivers/usb:btusb b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/drivers/usb:btusb
deleted file mode 120000 (symlink)
index c173837..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/drivers/usb:btusb
+++ /dev/null
@@ -1 +0,0 @@
-../../../bus/usb/drivers/btusb
\ No newline at end of file

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/initsize b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/initsize
deleted file mode 100644 (file)
index 573541a..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/initsize
+++ /dev/null
@@ -1 +0,0 @@
-0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/notes/.note.gnu.build-id b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/notes/.note.gnu.build-id
deleted file mode 100644 (file)
index 0afeca4..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/notes/.note.gnu.build-id and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/disable_scofix b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/disable_scofix
deleted file mode 100644 (file)
index d52e798..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/disable_scofix
+++ /dev/null
@@ -1 +0,0 @@
-N

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/force_scofix b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/force_scofix
deleted file mode 100644 (file)
index d52e798..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/force_scofix
+++ /dev/null
@@ -1 +0,0 @@
-N

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/ignore_csr b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/ignore_csr
deleted file mode 100644 (file)
index d52e798..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/ignore_csr
+++ /dev/null
@@ -1 +0,0 @@
-N

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/ignore_dga b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/ignore_dga
deleted file mode 100644 (file)
index d52e798..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/ignore_dga
+++ /dev/null
@@ -1 +0,0 @@
-N

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/ignore_sniffer b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/ignore_sniffer
deleted file mode 100644 (file)
index d52e798..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/ignore_sniffer
+++ /dev/null
@@ -1 +0,0 @@
-N

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/reset b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/reset
deleted file mode 100644 (file)
index 9bda8c3..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/parameters/reset
+++ /dev/null
@@ -1 +0,0 @@
-Y

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/refcnt b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/refcnt
deleted file mode 100644 (file)
index 573541a..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/refcnt
+++ /dev/null
@@ -1 +0,0 @@
-0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.bss b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.bss
deleted file mode 100644 (file)
index 44785c0..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.bss
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00ee708

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.data b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.data
deleted file mode 100644 (file)
index bfdb603..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.data
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00edf20

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.exit.text b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.exit.text
deleted file mode 100644 (file)
index a504729..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.exit.text
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00edc68

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.gnu.linkonce.this_module b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.gnu.linkonce.this_module
deleted file mode 100644 (file)
index 2b18edc..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.gnu.linkonce.this_module
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00ee4e0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.init.text b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.init.text
deleted file mode 100644 (file)
index 017c50e..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.init.text
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00f0000

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.note.gnu.build-id b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.note.gnu.build-id
deleted file mode 100644 (file)
index 982e7c1..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.note.gnu.build-id
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00edc7c

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.rodata b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.rodata
deleted file mode 100644 (file)
index 4988b02..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.rodata
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00edec0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.rodata.str1.1 b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.rodata.str1.1
deleted file mode 100644 (file)
index 52bcaf7..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.rodata.str1.1
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00edd11

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.rodata.str1.8 b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.rodata.str1.8
deleted file mode 100644 (file)
index 68be4ed..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.rodata.str1.8
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00edca0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.smp_locks b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.smp_locks
deleted file mode 100644 (file)
index 9978310..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.smp_locks
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00edd90

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.strtab b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.strtab
deleted file mode 100644 (file)
index e4fdf8e..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.strtab
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00f0dd0

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.symtab b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.symtab
deleted file mode 100644 (file)
index 73f8cee..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.symtab
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00f0020

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.text b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.text
deleted file mode 100644 (file)
index d39dfe6..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/.text
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00ec000

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/__param b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/__param
deleted file mode 100644 (file)
index 76e34cd..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/sections/__param
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffa00ede00

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/srcversion b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/srcversion
deleted file mode 100644 (file)
index 2d4bd99..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/srcversion
+++ /dev/null
@@ -1 +0,0 @@
-1FC03999655A6ECD28DC794

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/taint b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/taint
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/taint
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/version b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/version
deleted file mode 100644 (file)
index 5a2a580..0000000
--- a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/version
+++ /dev/null
@@ -1 +0,0 @@
-0.6

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/initstate b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/mod_loop_a/initstate
similarity index 100%
rename from testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/bluetooth/initstate
rename to testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/mod_loop_a/initstate

diff --git a/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/initstate b/testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/mod_loop_b/initstate
similarity index 100%
rename from testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/btusb/initstate
rename to testsuite/rootfs-pristine/test-modprobe/show-depends/sys/module/mod_loop_b/initstate

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index 8cd1ab96ddf12c3b6fc1a3950b2fe028d0e1679a..f4cc83646c1f9c9b1a2cb618dbf7c19c67caabc6 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -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 = "",
        );