diff options
author | Karel Zak | 2016-10-26 10:22:40 +0200 |
---|---|---|
committer | Karel Zak | 2016-10-26 10:22:40 +0200 |
commit | c95cad20985376cd62f7ed2ed8943940e1773a07 (patch) | |
tree | 15e03a2515c3de4250165ff7a5faf4c1d920d322 /tests | |
parent | misc: fix unsigned int usage for ctype.h functions (diff) | |
parent | test: fix raid1 minimum I/O size (diff) | |
download | kernel-qcow2-util-linux-c95cad20985376cd62f7ed2ed8943940e1773a07.tar.gz kernel-qcow2-util-linux-c95cad20985376cd62f7ed2ed8943940e1773a07.tar.xz kernel-qcow2-util-linux-c95cad20985376cd62f7ed2ed8943940e1773a07.zip |
Merge branch 'tests-raid1' of https://github.com/rudimeier/util-linux
Diffstat (limited to 'tests')
-rw-r--r-- | tests/expected/blkid/md-raid1-whole | 2 | ||||
-rwxr-xr-x | tests/ts/blkid/md-raid1-whole | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole index d715f3933..ae5a95ddb 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 76ff8f838..050adecd7 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 |