diff options
| -rw-r--r-- | tests/functions.sh | 7 | ||||
| -rwxr-xr-x | tests/ts/blkid/md-raid0-whole | 5 | ||||
| -rwxr-xr-x | tests/ts/blkid/md-raid1-part | 6 | ||||
| -rwxr-xr-x | tests/ts/blkid/md-raid1-whole | 5 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K | 5 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K-63 | 5 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K-md | 5 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-512 | 4 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-512-topology | 5 |
9 files changed, 18 insertions, 29 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index 70bd45a23..acfbbeefe 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -393,3 +393,10 @@ s/# <!-- util-linux.*-->//; /^$/d" /etc/fstab } +function ts_fdisk_clean { + # remove non comparable parts of fdisk output + [ x"${DEVNAME}" != x"" ] && sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT + sed -i -e 's/Disk identifier:.*//g' \ + -e 's/Building a new.*//g' \ + $TS_OUTPUT +} diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole index 2ef7bcdf6..7a55c549b 100755 --- a/tests/ts/blkid/md-raid0-whole +++ b/tests/ts/blkid/md-raid0-whole @@ -78,9 +78,8 @@ ts_log "Deinitialize devices" ts_device_deinit $DEVICE1 ts_device_deinit $DEVICE2 -# remove disk ID and generated UUIDs -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean +# remove generated UUIDs sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT ts_finalize diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part index 75630a2d3..634c9a154 100755 --- a/tests/ts/blkid/md-raid1-part +++ b/tests/ts/blkid/md-raid1-part @@ -82,10 +82,8 @@ $TS_CMD_BLKID -p -o udev ${DEVICE}2 2>&1 | sort >> $TS_OUTPUT sleep 3 rmmod scsi_debug -# remove device name used, disk ID and generated UUIDs -sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean +# remove generated UUIDs sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT ts_finalize diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole index 75efc4271..32e17b8d0 100755 --- a/tests/ts/blkid/md-raid1-whole +++ b/tests/ts/blkid/md-raid1-whole @@ -78,9 +78,8 @@ ts_log "Deinitialize devices" ts_device_deinit $DEVICE1 ts_device_deinit $DEVICE2 -# remove disk ID and generated UUIDs -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean +# remove generated UUIDs sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT ts_finalize diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K index 2bc128042..3d930223b 100755 --- a/tests/ts/fdisk/align-512-4K +++ b/tests/ts/fdisk/align-512-4K @@ -82,9 +82,6 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP sleep 3 rmmod scsi_debug -# remove device name used and disk ID -sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean ts_finalize diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63 index cd7d2ac5a..7a8e95cef 100755 --- a/tests/ts/fdisk/align-512-4K-63 +++ b/tests/ts/fdisk/align-512-4K-63 @@ -82,9 +82,6 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP sleep 3 rmmod scsi_debug -# remove device name used and disk ID -sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean ts_finalize diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md index fc2ce69cf..f55ee22f1 100755 --- a/tests/ts/fdisk/align-512-4K-md +++ b/tests/ts/fdisk/align-512-4K-md @@ -94,9 +94,6 @@ sleep 3 /sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 rmmod scsi_debug -# remove device name used and disk ID -sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean ts_finalize diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512 index f60f404f2..82a6268cf 100755 --- a/tests/ts/fdisk/align-512-512 +++ b/tests/ts/fdisk/align-512-512 @@ -65,8 +65,6 @@ EOF ts_device_deinit $DEVICE -# remove disk ID -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean ts_finalize diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology index baf9155a7..ec10fd85f 100755 --- a/tests/ts/fdisk/align-512-512-topology +++ b/tests/ts/fdisk/align-512-512-topology @@ -82,9 +82,6 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP sleep 3 rmmod scsi_debug -# remove device name used and disk ID -sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT -sed -i -e 's/Disk identifier:.*//g' $TS_OUTPUT -sed -i -e 's/Building a new.*//g' $TS_OUTPUT +ts_fdisk_clean ts_finalize |