From 557c68fbd29551f4db6215ab03abfaaa54c6f78f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 20 Sep 2022 20:37:12 +0200 Subject: [PATCH] support/tests/cpio: extend runtime tests for extra dract modules Add a basic module that installs a single file, to check that it is properly accounted for. Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN Cc: Thierry Bultel Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- support/testing/tests/fs/test_cpio.py | 5 ++++- .../fs/test_cpio/modules/99cramfs/module-setup.sh | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh diff --git a/support/testing/tests/fs/test_cpio.py b/support/testing/tests/fs/test_cpio.py index 8c0d357994..172af579bb 100644 --- a/support/testing/tests/fs/test_cpio.py +++ b/support/testing/tests/fs/test_cpio.py @@ -41,9 +41,11 @@ class TestCpioDracutBase(infra.basetest.BRTest): BR2_PACKAGE_PV=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_DRACUT=y + BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES="{}" BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES="{}" # BR2_TARGET_ROOTFS_TAR is not set - """.format(" ".join(["fs/cpio/dracut.conf", + """.format("support/testing/tests/fs/test_cpio/modules", + " ".join(["fs/cpio/dracut.conf", "support/testing/tests/fs/test_cpio/dracut-cramfs.conf"])) def check_dracut(self): @@ -57,6 +59,7 @@ class TestCpioDracutBase(infra.basetest.BRTest): self.assertEqual(out.find("bin/pv"), -1) # libz should be, because of cramfs self.assertNotEqual(out.find("usr/bin/mkcramfs"), -1) + self.assertNotEqual(out.find("usr/bin/cramfsck"), -1) self.assertNotEqual(out.find("usr/lib/libz.so"), -1) exit_code = boot_img(self.emulator, diff --git a/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh b/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh new file mode 100755 index 0000000000..60706c8bd9 --- /dev/null +++ b/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh @@ -0,0 +1,11 @@ +check() { + return 0 +} + +depends() { + return 0 +} + +install() { + inst_multiple /usr/bin/cramfsck +}