1 From 1fc0439a5bd27697fb5daa911f776de4a69e0ca3 Mon Sep 17 00:00:00 2001
2 From: "Brian C. Lane" <bcl@redhat.com>
3 Date: Mon, 29 Feb 2016 14:31:35 -0800
4 Subject: [PATCH 28/28] tests: Fix t1700 failing on a host with a 4k xfs
7 The problem is that mkfs.xfs won't work if the file it is trying to
8 create is on a filesystem with a sector size larger than the passed
9 -ssize value. So a host with 4k disks (eg. s390) and the xfs filesystem
10 will fail with the error message:
11 illegal sector size 512; hw sector is 4096
13 Failures setting up the environment for the test aren't parted bugs.
14 This stops treating mkfs and dd errors as test failures, skipping the fs
15 and logging a warning.
19 tests/t1700-probe-fs.sh | 12 ++++++------
20 1 file changed, 6 insertions(+), 6 deletions(-)
22 diff --git a/tests/t1700-probe-fs.sh b/tests/t1700-probe-fs.sh
23 index 94ed9ae..b13cec0 100755
24 --- a/tests/t1700-probe-fs.sh
25 +++ b/tests/t1700-probe-fs.sh
26 @@ -39,13 +39,13 @@ for type in ext2 ext3 ext4 btrfs xfs nilfs2 ntfs vfat hfsplus; do
27 hfsplus) fsname=hfs+;;
30 - # create an $type file system
31 + # create an $type file system, creation failures are not parted bugs,
32 + # skip the filesystem instead of failing the test.
33 if [ "$type" = "xfs" ]; then
34 - # Work around a problem with s390
35 - mkfs.xfs -ssize=$ss -dfile,name=$dev,size=${n_sectors}s || fail=1
36 + mkfs.xfs -ssize=$ss -dfile,name=$dev,size=${n_sectors}s || { warn_ "$ME: mkfs.$type failed, skipping"; continue; }
38 - dd if=/dev/null of=$dev bs=$ss seek=$n_sectors >/dev/null || fail=1
39 - mkfs.$type $force $dev || { warn_ $ME: mkfs.$type failed; fail=1; continue; }
40 + dd if=/dev/null of=$dev bs=$ss seek=$n_sectors >/dev/null || { warn_ "$ME: dd failed, skipping $type"; continue; }
41 + mkfs.$type $force $dev || { warn_ "$ME: mkfs.$type failed skipping"; continue; }
44 # probe the $type file system
45 @@ -57,7 +57,7 @@ done
46 # Some features should indicate ext4 by themselves.
47 for feature in uninit_bg flex_bg; do
48 # create an ext3 file system
49 - dd if=/dev/null of=$dev bs=1024 seek=4096 >/dev/null || fail=1
50 + dd if=/dev/null of=$dev bs=1024 seek=4096 >/dev/null || skip_ "dd failed"
51 mkfs.ext3 -F $dev >/dev/null || skip_ "mkfs.ext3 failed"