From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Fri, 21 Oct 2016 14:19:29 +0000 (+0200)
Subject: test: fix raid1 minimum I/O size
X-Git-Tag: v2.29~33^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=561dedcf3b381c385323fea8796b89f75826c50f;p=thirdparty%2Futil-linux.git

test: fix raid1 minimum I/O size

Seems this has been changed in kernels >4.4.x or >4.8
from 512 bytes to 64K.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index d715f3933e..ae5a95ddbb 100644
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -24,7 +24,7 @@ Created a new <removed>.
 Command (m for help): Disk /dev/md8: 50 MiB, 52363264 bytes, 102272 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
-I/O size (minimum/optimal): 512 bytes / <removed> bytes
+I/O size (minimum/optimal): <removed> bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole
index 76ff8f8389..050adecd7a 100755
--- a/tests/ts/blkid/md-raid1-whole
+++ b/tests/ts/blkid/md-raid1-whole
@@ -80,6 +80,8 @@ udevadm settle
 ts_log "Deinitialize devices"
 
 ts_fdisk_clean
+# seems that raid1 minimum I/O size has been changed in kernels >4.4.x and >4.8
+sed -i 's@^\(I/O size (minimum/optimal): \)[1-9][0-9]*@\1<removed>@' $TS_OUTPUT
 # remove generated UUIDs
 sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT