summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2023-05-19 22:01:05 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2023-05-22 05:40:05 +0200
commit23ff8a776cc7e3c09293243162b3018a34c26298 (patch)
tree5605d8eaddc203595949856dd3d845f08dcea7fc
parentudevadm-verify: introduce --no-summary option (diff)
downloadsystemd-23ff8a776cc7e3c09293243162b3018a34c26298.tar.xz
systemd-23ff8a776cc7e3c09293243162b3018a34c26298.zip
test: install test specific modules in test_append_files()
-rwxr-xr-xtest/TEST-35-LOGIN/test.sh2
-rwxr-xr-xtest/TEST-54-CREDS/test.sh3
-rw-r--r--test/test-functions5
3 files changed, 6 insertions, 4 deletions
diff --git a/test/TEST-35-LOGIN/test.sh b/test/TEST-35-LOGIN/test.sh
index 808f94a58f..a781be7b3c 100755
--- a/test/TEST-35-LOGIN/test.sh
+++ b/test/TEST-35-LOGIN/test.sh
@@ -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 "$@"
diff --git a/test/TEST-54-CREDS/test.sh b/test/TEST-54-CREDS/test.sh
index 5269eaa437..443be8761e 100755
--- a/test/TEST-54-CREDS/test.sh
+++ b/test/TEST-54-CREDS/test.sh
@@ -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
}
diff --git a/test/test-functions b/test/test-functions
index 3a2a59758f..06431347cc 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -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
}