ce8126ec00
- tests/t3000: Check for hfs and vfat support separately (bcl) - tests: Reduce memory usage for tests using scsi_debug module (bcl) - spec: Install to /usr/sbin and /usr/lib64 (bcl)
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From 964bc37f6c95308a64aa96534b29412ce55835fd Mon Sep 17 00:00:00 2001
|
|
From: "Brian C. Lane" <bcl@redhat.com>
|
|
Date: Thu, 29 Jul 2021 11:19:15 -0700
|
|
Subject: [PATCH 24/24] tests/t3000: Use mkfs.hfsplus and fsck.hfsplus for
|
|
resize tests
|
|
|
|
---
|
|
tests/t3000-resize-fs.sh | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tests/t3000-resize-fs.sh b/tests/t3000-resize-fs.sh
|
|
index 282b6fc..cf46c81 100755
|
|
--- a/tests/t3000-resize-fs.sh
|
|
+++ b/tests/t3000-resize-fs.sh
|
|
@@ -24,13 +24,13 @@ require_512_byte_sector_size_
|
|
|
|
FSTYPES=""
|
|
|
|
-# Is mkfs.hfs available?
|
|
-mkfs.hfs 2>&1 | grep '^usage:' && FSTYPES="hfs+"
|
|
+# Is mkfs.hfsplus available?
|
|
+mkfs.hfsplus 2>&1 | grep '^usage:' && FSTYPES="hfs+"
|
|
|
|
# Is mkfs.vfat available?
|
|
mkfs.vfat 2>&1 | grep '^Usage:' && FSTYPES="$FSTYPES fat32 fat16"
|
|
|
|
-[ -n "$FSTYPES" ] || skip_ "Neither mkfs.hfs nor mkfs.vfat installed"
|
|
+[ -n "$FSTYPES" ] || skip_ "Neither mkfs.hfsplus nor mkfs.vfat installed"
|
|
|
|
|
|
ss=$sector_size_
|
|
@@ -79,7 +79,7 @@ for fs_type in $FSTYPES; do
|
|
case $fs_type in
|
|
fat16) mkfs_cmd='mkfs.vfat -F 16'; fsck='fsck.vfat -v';;
|
|
fat32) mkfs_cmd='mkfs.vfat -F 32'; fsck='fsck.vfat -v';;
|
|
- hfs*) mkfs_cmd='mkfs.hfs'; fsck=fsck.hfs;;
|
|
+ hfs*) mkfs_cmd='mkfs.hfsplus'; fsck=fsck.hfsplus;;
|
|
*) error "internal error: unhandled fs type: $fs_type";;
|
|
esac
|
|
|
|
--
|
|
2.31.1
|
|
|