testsuite: port install-cmd-loop test to module-playground

diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh
index d4b485a17eed848c8ef3867b9ce52f7b84f11b12..5a72fe529e3dab8f8a37f281ae6129bc7e3603dd 100755 (executable)
--- a/testsuite/populate-modules.sh
+++ b/testsuite/populate-modules.sh
@@ -27,6 +27,8 @@ map=(
     ["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"
+    ["test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko"
+    ["test-modprobe/install-cmd-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"

diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/etc/modprobe.d/dumb-instal-loop.conf b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/etc/modprobe.d/dumb-instal-loop.conf
index 8014af33ff39c089b86f1e42430ea815f3b81414..4ec3fbf3d1431c2e81328c393cd753a48fbe489d 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/etc/modprobe.d/dumb-instal-loop.conf
+++ b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/etc/modprobe.d/dumb-instal-loop.conf
@@ -1 +1 @@
-install snd $MODPROBE --ignore-install snd && { $MODPROBE --quiet snd-ioctl32 ; $MODPROBE --quiet snd-pcm ; }
+install mod-loop-b $MODPROBE --ignore-install mod-loop-b && { $MODPROBE --quiet mod-loop-a ; }

diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko
deleted file mode 100644 (file)
index 4a1dfd1..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko
deleted file mode 100644 (file)
index cde0e7f..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko and /dev/null differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.alias
index 8631be646c6874cbca8144bbcb99e8f70e26104e..ba76e1815af0205c1d4ed0160696e2454deb20a8 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.alias
+++ b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.alias
@@ -1,2 +1 @@
 # Aliases extracted from modules themselves.
-alias char-major-116-* snd

diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.alias.bin
index e9d268042e6e3f5867cdf52d832722d9529174bd..7075435f6268c4d815aec093d61e26647666ba76 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.alias.bin and b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.alias.bin differ

diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.builtin.bin b/testsuite/rootfs-pristine/test-modprobe/install-cmd-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/install-cmd-loop/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep
index 920385873ce54bd6f3802a1b0f3a280c79185417..869e6ea565f0981c5ac3b0aa74a01e2c7c41c1e8 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep
+++ b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep
@@ -1,2 +1,2 @@
-kernel/sound/core/snd.ko:
-kernel/sound/core/snd-pcm.ko: kernel/sound/core/snd.ko
+kernel/mod-loop-b.ko:
+kernel/mod-loop-a.ko: kernel/mod-loop-b.ko

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

diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.symbols b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.symbols
index 300cdc2edb817342b56dc407673de7e5c1a2eeae..6c535800518432faff0fcb1736d936d28c7cee3a 100644 (file)
--- a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.symbols
+++ b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.symbols
@@ -1,133 +1,3 @@
 # Aliases for symbols, used by symbol_request().
-alias symbol:copy_from_user_toio snd
-alias symbol:snd_kctl_jack_new snd
-alias symbol:snd_pcm_hw_constraint_minmax snd_pcm
-alias symbol:snd_ctl_register_ioctl_compat snd
-alias symbol:snd_pcm_period_elapsed snd_pcm
-alias symbol:snd_pcm_format_linear snd_pcm
-alias symbol:snd_pcm_format_big_endian snd_pcm
-alias symbol:snd_request_card snd
-alias symbol:snd_pcm_lib_ioctl snd_pcm
-alias symbol:snd_add_device_sysfs_file snd
-alias symbol:snd_card_proc_new snd
-alias symbol:snd_ctl_boolean_stereo_info snd
-alias symbol:snd_unregister_oss_device snd
-alias symbol:snd_card_free snd
-alias symbol:snd_pcm_sgbuf_ops_page snd_pcm
-alias symbol:snd_pcm_new_stream snd_pcm
-alias symbol:snd_card_create snd
-alias symbol:snd_card_register snd
-alias symbol:snd_ctl_free_one snd
-alias symbol:snd_register_device_for_dev snd
-alias symbol:snd_lookup_oss_minor_data snd
-alias symbol:snd_pcm_hw_constraint_step snd_pcm
-alias symbol:snd_seq_root snd
-alias symbol:snd_pcm_new snd_pcm
-alias symbol:snd_card_set_id snd
-alias symbol:snd_info_register snd
-alias symbol:snd_pcm_lib_preallocate_pages snd_pcm
-alias symbol:snd_pcm_hw_rule_noresample snd_pcm
-alias symbol:snd_ctl_remove snd
-alias symbol:snd_pcm_lib_read snd_pcm
-alias symbol:snd_pcm_mmap_data snd_pcm
-alias symbol:snd_pcm_hw_constraint_list snd_pcm
-alias symbol:snd_oss_info_register snd
-alias symbol:snd_dma_pointer snd
-alias symbol:snd_ctl_new1 snd
-alias symbol:snd_interval_ratnum snd_pcm
-alias symbol:snd_pcm_release_substream snd_pcm
-alias symbol:snd_pcm_suspend_all snd_pcm
-alias symbol:snd_ctl_register_ioctl snd
-alias symbol:snd_ctl_rename_id snd
-alias symbol:snd_card_file_add snd
-alias symbol:snd_pcm_limit_hw_rates snd_pcm
-alias symbol:snd_jack_set_parent snd
-alias symbol:snd_pcm_format_width snd_pcm
-alias symbol:snd_jack_new snd
-alias symbol:snd_ctl_make_virtual_master snd
-alias symbol:snd_jack_report snd
-alias symbol:snd_pcm_format_little_endian snd_pcm
-alias symbol:snd_ctl_notify snd
-alias symbol:snd_pcm_set_sync snd_pcm
-alias symbol:snd_component_add snd
-alias symbol:_snd_ctl_add_slave snd
-alias symbol:snd_device_register snd
-alias symbol:snd_iprintf snd
-alias symbol:snd_pcm_lib_default_mmap snd_pcm
-alias symbol:_snd_pcm_hw_params_any snd_pcm
-alias symbol:snd_card_file_remove snd
-alias symbol:snd_ctl_replace snd
-alias symbol:snd_pcm_link_rwlock snd_pcm
-alias symbol:snd_info_get_line snd
-alias symbol:snd_ctl_activate_id snd
-alias symbol:snd_pcm_format_signed snd_pcm
-alias symbol:snd_pcm_open_substream snd_pcm
-alias symbol:snd_dma_disable snd
-alias symbol:snd_pcm_set_ops snd_pcm
-alias symbol:release_and_free_resource snd
-alias symbol:snd_ecards_limit snd
-alias symbol:snd_pcm_hw_param_value snd_pcm
-alias symbol:snd_cards snd
-alias symbol:snd_device_free snd
-alias symbol:snd_dma_program snd
-alias symbol:snd_interval_refine snd_pcm
-alias symbol:snd_pcm_lib_preallocate_free_for_all snd_pcm
-alias symbol:snd_pcm_hw_constraint_msbits snd_pcm
-alias symbol:snd_pcm_lib_mmap_iomem snd_pcm
-alias symbol:snd_pcm_lib_get_vmalloc_page snd_pcm
-alias symbol:snd_pcm_suspend snd_pcm
-alias symbol:snd_pcm_format_unsigned snd_pcm
-alias symbol:snd_card_free_when_closed snd
-alias symbol:snd_ctl_unregister_ioctl_compat snd
-alias symbol:snd_interval_list snd_pcm
-alias symbol:snd_pcm_lib_malloc_pages snd_pcm
-alias symbol:snd_unregister_device snd
-alias symbol:snd_pcm_lib_readv snd_pcm
-alias symbol:snd_pcm_hw_constraint_ratnums snd_pcm
-alias symbol:snd_pcm_hw_constraint_ratdens snd_pcm
-alias symbol:snd_major snd
-alias symbol:copy_to_user_fromio snd
-alias symbol:snd_pcm_format_name snd_pcm
-alias symbol:snd_pcm_lib_preallocate_pages_for_all snd_pcm
-alias symbol:snd_ctl_add snd
-alias symbol:snd_info_create_card_entry snd
-alias symbol:snd_pcm_hw_rule_add snd_pcm
-alias symbol:snd_pcm_lib_writev snd_pcm
-alias symbol:snd_pcm_format_set_silence snd_pcm
-alias symbol:snd_pcm_hw_param_last snd_pcm
-alias symbol:snd_card_disconnect snd
-alias symbol:snd_info_get_str snd
-alias symbol:snd_lookup_minor_data snd
-alias symbol:snd_pci_quirk_lookup_id snd
-alias symbol:snd_pcm_rate_to_rate_bit snd_pcm
-alias symbol:snd_pcm_lib_free_vmalloc_buffer snd_pcm
-alias symbol:snd_pcm_format_silence_64 snd_pcm
-alias symbol:snd_pcm_sgbuf_get_chunk_size snd_pcm
-alias symbol:snd_pci_quirk_lookup snd
-alias symbol:snd_pcm_notify snd_pcm
-alias symbol:_snd_pcm_hw_param_setempty snd_pcm
-alias symbol:snd_power_wait snd
-alias symbol:snd_pcm_hw_constraint_pow2 snd_pcm
-alias symbol:snd_register_oss_device snd
-alias symbol:snd_ctl_find_numid snd
-alias symbol:snd_pcm_kernel_ioctl snd_pcm
-alias symbol:snd_pcm_hw_constraint_integer snd_pcm
-alias symbol:snd_pcm_lib_write snd_pcm
-alias symbol:snd_kctl_jack_report snd
-alias symbol:snd_pcm_lib_free_pages snd_pcm
-alias symbol:snd_pcm_hw_param_first snd_pcm
-alias symbol:snd_ctl_enum_info snd
-alias symbol:snd_jack_set_key snd
-alias symbol:snd_device_new snd
-alias symbol:snd_ctl_find_id snd
-alias symbol:snd_pcm_hw_refine snd_pcm
-alias symbol:snd_ctl_boolean_mono_info snd
-alias symbol:snd_mixer_oss_notify_callback snd
-alias symbol:snd_pcm_format_size snd_pcm
-alias symbol:snd_pcm_format_physical_width snd_pcm
-alias symbol:snd_info_free_entry snd
-alias symbol:snd_ctl_remove_id snd
-alias symbol:_snd_pcm_lib_alloc_vmalloc_buffer snd_pcm
-alias symbol:snd_pcm_stop snd_pcm
-alias symbol:snd_ctl_unregister_ioctl snd
-alias symbol:snd_info_create_module_entry snd
+alias symbol:printB mod_loop_b
+alias symbol:printA mod_loop_a

diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.symbols.bin b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.symbols.bin
index 03366e367fc33f348004a2fdfd522e7e3493ae72..7cb72ca101edd6277e574ce134e758bbc0399fd9 100644 (file)
Binary files a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.symbols.bin and b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.symbols.bin differ

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index 8972d989d8ba9df8a5bc659426e4d3571afd6c69..1ec34879bcbcba02069c73a5513eb551eb179846 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -141,7 +141,7 @@ static noreturn int modprobe_install_cmd_loop(const struct test *t)
        const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
-               "snd-pcm",
+               "mod-loop-a",
                NULL,
        };
 
@@ -159,7 +159,7 @@ DEFINE_TEST(modprobe_install_cmd_loop,
                { "MODPROBE", ABS_TOP_BUILDDIR "/tools/modprobe" },
                { }
                },
-       .modules_loaded = "snd,snd-pcm",
+       .modules_loaded = "mod-loop-b,mod-loop-a",
        );
 
 static noreturn int modprobe_param_kcmdline(const struct test *t)