testsuite: port softdep-loop test to module-playground

diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh
index bef3db1d2cafd6efacd7e7e549f1f22989a25015..c8dd5c5d7dd1e02b9572f0d4acc89d41acaca625 100755 (executable)
--- a/testsuite/populate-modules.sh
+++ b/testsuite/populate-modules.sh
@@ -25,6 +25,8 @@ map=(
     ["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"
+    ["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"
 )
 
 for k in ${!map[@]}; do

diff --git a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/etc/modprobe.d/dumb-softdep.conf b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/etc/modprobe.d/dumb-softdep.conf
index fa41143fb61ad049e758197939990ee4f7fec1be..af30b49317fbf07befb1338ebd5a3a2774bf3183 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/etc/modprobe.d/dumb-softdep.conf
+++ b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/etc/modprobe.d/dumb-softdep.conf
@@ -1 +1 @@
-softdep bluetooth post: btusb
+softdep mod-loop-b post: mod-loop-a

diff --git a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/kernel/drivers/bluetooth/btusb.ko b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/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/softdep-loop/lib/modules/4.4.4/kernel/drivers/bluetooth/btusb.ko and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/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/softdep-loop/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/kernel/net/bluetooth/bluetooth.ko b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/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/softdep-loop/lib/modules/4.4.4/kernel/net/bluetooth/bluetooth.ko and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.alias
index 94804f1036295b5449b9412883ee776d6ce66505..ba76e1815af0205c1d4ed0160696e2454deb20a8 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.alias
+++ b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/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/softdep-loop/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.alias.bin
index 86481a4287d0572bff4183103b9df304f647dfe4..7075435f6268c4d815aec093d61e26647666ba76 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.alias.bin and b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.alias.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.builtin.bin b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.builtin.bin
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.dep
index a34af87a216f0ea2eb3ebc1f5dc446746de0b355..869e6ea565f0981c5ac3b0aa74a01e2c7c41c1e8 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.dep
+++ b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.dep
@@ -1,3 +1,2 @@
-kernel/drivers/bluetooth/btusb.ko: kernel/net/bluetooth/bluetooth.ko
-kernel/drivers/input/mouse/psmouse.ko:
-kernel/net/bluetooth/bluetooth.ko:
+kernel/mod-loop-b.ko:
+kernel/mod-loop-a.ko: kernel/mod-loop-b.ko

diff --git a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.dep.bin
index 338270636bb7448c9faea63e38bb004d226ee376..3d1b357e9309c811be09d4dcf19f9b31991309a5 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.dep.bin and b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.dep.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.softdep
index 3cc051267da5c6670897c346f1f6e52d14e244be..5554ccca7f9ea1ab44cafeac31c4995158983689 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.softdep
+++ b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/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/softdep-loop/lib/modules/4.4.4/modules.symbols b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.symbols
index b970b60d9966c7a1a8921b153b4a8f17c358f995..6c535800518432faff0fcb1736d936d28c7cee3a 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.symbols
+++ b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/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/softdep-loop/lib/modules/4.4.4/modules.symbols.bin b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.symbols.bin
index 156a61fadcf6ccc47ee2755acb084683dd83d560..7cb72ca101edd6277e574ce134e758bbc0399fd9 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.symbols.bin and b/testsuite/rootfs-pristine/test-modprobe/softdep-loop/lib/modules/4.4.4/modules.symbols.bin differ

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index f4cc83646c1f9c9b1a2cb618dbf7c19c67caabc6..99fe72c878b6bbd29eddb92b473d6eea55c11eeb 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -119,7 +119,7 @@ static noreturn int modprobe_softdep_loop(const struct test *t)
        const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
-               "bluetooth",
+               "mod-loop-b",
                NULL,
        };
 
@@ -133,7 +133,7 @@ DEFINE_TEST(modprobe_softdep_loop,
                [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/softdep-loop",
                [TC_INIT_MODULE_RETCODES] = "",
        },
-       .modules_loaded = "btusb,bluetooth",
+       .modules_loaded = "mod-loop-a,mod-loop-b",
        );
 
 static noreturn int modprobe_install_cmd_loop(const struct test *t)