]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: install test specific modules in test_append_files()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 19 May 2023 20:01:05 +0000 (05:01 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 22 May 2023 03:40:05 +0000 (12:40 +0900)
test/TEST-35-LOGIN/test.sh
test/TEST-54-CREDS/test.sh
test/test-functions

index 808f94a58ff546aa702db15d52557194f76925dd..a781be7b3c51f24e0173295bb74193841717ae78 100755 (executable)
@@ -9,6 +9,8 @@ TEST_DESCRIPTION="Tests for systemd-logind"
 
 test_append_files() {
     image_install -o evemu-device evemu-event
+    instmods uinput
+    generate_module_dependencies
 }
 
 do_test "$@"
index 5269eaa437e632b9522332e047af00b2af84b590..443be8761e0edfbd4d7b447c6cea921b0c9cc99d 100755 (executable)
@@ -32,6 +32,9 @@ KERNEL_APPEND="${KERNEL_APPEND:-} ${KERNEL_CREDS[*]}"
 
 test_append_files() {
     instmods qemu_fw_cfg
+    if get_bool "$LOOKS_LIKE_SUSE"; then
+        instmods dmi-sysfs
+    fi
     generate_module_dependencies
 }
 
index 3a2a59758f70ffebcb9af640a66594b077e47f1b..06431347cc1daeaad19a8f96e597ebe5a50a1af8 100644 (file)
@@ -966,13 +966,10 @@ install_modules() {
     instmods loop =block
     instmods nls_ascii =nls
     instmods overlay =overlayfs
-    # for TEST-35-LOGIN
-    instmods scsi_debug uinput
+    instmods scsi_debug
 
     if get_bool "$LOOKS_LIKE_SUSE"; then
         instmods ext4
-        # for TEST-54-CREDS
-        instmods dmi-sysfs
     fi
 }