1 From ac74b830ce518c2228b8ae3fba3f1ece82b49f81 Mon Sep 17 00:00:00 2001
2 From: Mike Fleetwood <mike.fleetwood@googlemail.com>
3 Date: Sun, 28 Sep 2014 16:15:50 +0100
4 Subject: [PATCH 6/6] tests: t3000-resize-fs.sh: Add requirement on mkfs.vfat
6 Add test skipping requirement on mkfs.vfat for the FAT32 and FAT16 file
7 system resizing tests. This matches existing test skipping requirement
8 on mkfs.hfs for the hfs+ file system.
10 * tests/t3000-resize-fs.sh: Also correct skip_test_ to skip_.
11 * tests/t-lib-helpers.sh: Also update message for requirement of hfs.
13 tests/t-lib-helpers.sh | 8 +++++++-
14 tests/t3000-resize-fs.sh | 5 +++--
15 2 files changed, 10 insertions(+), 3 deletions(-)
17 diff --git a/tests/t-lib-helpers.sh b/tests/t-lib-helpers.sh
18 index 4e83a05..c8684bb 100644
19 --- a/tests/t-lib-helpers.sh
20 +++ b/tests/t-lib-helpers.sh
21 @@ -20,7 +20,13 @@ require_acl_()
24 mkfs.hfs 2>&1 | grep '^usage:' \
25 - || skip_ "This test requires HFS support."
26 + || skip_ "mkfs.hfs: command not found"
31 + mkfs.vfat 2>&1 | grep '^Usage:' \
32 + || skip_ "mkfs.vfat: command not found"
35 # Skip this test if we're not in SELinux "enforcing" mode.
36 diff --git a/tests/t3000-resize-fs.sh b/tests/t3000-resize-fs.sh
37 index 9084eb4..a79a307 100755
38 --- a/tests/t3000-resize-fs.sh
39 +++ b/tests/t3000-resize-fs.sh
42 . "${srcdir=.}/init.sh"; path_prepend_ ../parted .
47 require_scsi_debug_module_
48 require_512_byte_sector_size_
49 @@ -31,7 +31,7 @@ default_end=546147s
51 # create memory-backed device
52 scsi_debug_setup_ dev_size_mb=550 > dev-name ||
53 - skip_test_ 'failed to create scsi_debug device'
54 + skip_ 'failed to create scsi_debug device'
58 @@ -47,6 +47,7 @@ device_sectors_required=$(echo $default_end | sed 's/s$//')
59 test $device_sectors_required -le $dev_n_sectors || fail=1
61 for fs_type in hfs+ fat32 fat16; do
62 + echo "fs_type=$fs_type"
64 # create an empty $fs_type partition, cylinder aligned, size > 256 MB
65 parted -a min -s $dev mkpart p1 $start $default_end > out 2>&1 || fail=1