Skip to content

Commit

Permalink
feat(test-root): add new module to share code between tests
Browse files Browse the repository at this point in the history
Use dracut to make a root filesystem instead of each test case.
  • Loading branch information
LaszloGombos authored and aafeijoo-suse committed Nov 7, 2022
1 parent 79504b6 commit b17a310
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
6 changes: 6 additions & 0 deletions modules.d/80test-root/module-setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

check() {
# Only include the module if another module requires it
return 255
}
21 changes: 12 additions & 9 deletions test/TEST-03-USR-MOUNT/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,20 @@ test_setup() {
(
# shellcheck disable=SC2030
export initdir=$TESTDIR/overlay/source
mkdir -p "$initdir"
mkdir -p -- "$initdir" "$TESTDIR"/overlay/tmp
# shellcheck disable=SC1090
. "$basedir"/dracut-init.sh
(
cd "$initdir" || exit
mkdir -p -- dev sys proc etc var/run tmp
mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin
)

"$basedir"/dracut.sh -l --keep --tmpdir "$TESTDIR"/overlay/tmp \
-m "test-root" \
-i ./test-init.sh /sbin/init \
-i "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \
-i "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \
--no-hostonly --no-hostonly-cmdline --nomdadmconf --nohardlink \
-f "$TESTDIR"/initramfs.root "$KVERSION" || return 1

mv "$TESTDIR"/overlay/tmp/dracut.*/initramfs/* "$initdir" && rm -rf "$TESTDIR"/overlay/tmp

inst_multiple sh df free ls poweroff stty cat ps ln \
mount dmesg mkdir cp \
umount strace less setsid dd sync
Expand All @@ -66,16 +72,13 @@ test_setup() {
done
inst_multiple -o ${_terminfodir}/l/linux

inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
inst_simple "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"

inst_multiple grep df
inst_simple ./fstab /etc/fstab
inst_simple /etc/os-release
inst ./test-init.sh /sbin/init
find_binary plymouth > /dev/null && inst_multiple plymouth
cp -a /etc/ld.so.conf* "$initdir"/etc
ldconfig -r "$initdir"
Expand Down

0 comments on commit b17a310

Please sign in to comment.