From 8fd25ba3438487cf79bd693c9022c51699562126 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 14 Mar 2023 10:06:39 +0100 Subject: [PATCH 1/2] tests: fix inverted condition in testsuite-58.sh --- test/units/testsuite-58.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh index c58465356c..20c2c57073 100755 --- a/test/units/testsuite-58.sh +++ b/test/units/testsuite-58.sh @@ -932,7 +932,7 @@ Minimize=guess EOF done - if ! command -v mksquashfs >/dev/null; then + if command -v mksquashfs >/dev/null; then tee "$defs/root-squashfs.conf" < Date: Tue, 14 Mar 2023 10:08:11 +0100 Subject: [PATCH 2/2] tests: don't use absolute paths when installing binaries in TEST-58-REPART Let image_install figures the binary paths out itself as not all distributions ship the mkfs.* tools in the same location. For example openSUSE ships mksquashfs in /usr/bin/. --- test/TEST-58-REPART/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/TEST-58-REPART/test.sh b/test/TEST-58-REPART/test.sh index 5f04d2017a..7549de568c 100755 --- a/test/TEST-58-REPART/test.sh +++ b/test/TEST-58-REPART/test.sh @@ -15,8 +15,8 @@ test_append_files() { instmods dm_verity =md instmods erofs generate_module_dependencies - image_install -o /sbin/mksquashfs - image_install -o /bin/mkfs.erofs + image_install -o mksquashfs + image_install -o mkfs.erofs fi inst_binary mcopy