| Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame] | 1 | Add checks for both mkfs.vfat and the vfat file system in the kernel before |
| 2 | running tests. |
| 3 | |
| 4 | Upstream-Status: Pending |
| 5 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
| 6 | |
| 7 | diff --git a/tests/t-lib-helpers.sh b/tests/t-lib-helpers.sh |
| 8 | index 4c6c75f..2cc7577 100644 |
| 9 | --- a/tests/t-lib-helpers.sh |
| 10 | +++ b/tests/t-lib-helpers.sh |
| 11 | @@ -418,3 +418,13 @@ require_64bit_() |
| 12 | ;; |
| 13 | esac |
| 14 | } |
| 15 | + |
| 16 | +# Check if the specified filesystem is either built into the kernel, or can be loaded |
| 17 | +# as a module |
| 18 | +# Usage: has_filesystem vfat |
| 19 | +# Ruturns 0 if the filesystem is available, otherwise skips the test |
| 20 | +require_filesystem_() |
| 21 | +{ |
| 22 | + grep -q $1 /proc/filesystems && return 0 |
| 23 | + modprobe --quiet --dry-run $1 || skip_ "this test requires kernel support for $1" |
| 24 | +} |
| 25 | diff --git a/tests/t1100-busy-label.sh b/tests/t1100-busy-label.sh |
| 26 | index f1a13df..0f47b08 100755 |
| 27 | --- a/tests/t1100-busy-label.sh |
| 28 | +++ b/tests/t1100-busy-label.sh |
| 29 | @@ -19,6 +19,9 @@ |
| 30 | . "${srcdir=.}/init.sh"; path_prepend_ ../parted |
| 31 | require_root_ |
| 32 | require_scsi_debug_module_ |
| 33 | +require_fat_ |
| 34 | +require_filesystem_ vfat |
| 35 | + |
| 36 | ss=$sector_size_ |
| 37 | |
| 38 | scsi_debug_setup_ sector_size=$ss dev_size_mb=90 > dev-name || |
| 39 | diff --git a/tests/t1101-busy-partition.sh b/tests/t1101-busy-partition.sh |
| 40 | index e35e6f0..c813848 100755 |
| 41 | --- a/tests/t1101-busy-partition.sh |
| 42 | +++ b/tests/t1101-busy-partition.sh |
| 43 | @@ -22,6 +22,8 @@ test "$VERBOSE" = yes && parted --version |
| 44 | |
| 45 | require_root_ |
| 46 | require_scsi_debug_module_ |
| 47 | +require_fat_ |
| 48 | +require_filesystem_ vfat |
| 49 | |
| 50 | # create memory-backed device |
| 51 | scsi_debug_setup_ dev_size_mb=80 > dev-name || |