diff options
| author | Francesco Cosoleto | 2011-08-17 00:19:05 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-08-30 10:54:37 +0200 |
| commit | d0bcd9b32284dbfeec9d76f4adf046fd68528398 (patch) | |
| tree | 557a5424db14d524e41b5e17c82fbc2d579b1ba3 /tests/ts/fdisk | |
| parent | fdisk: print welcome message (diff) | |
| download | kernel-qcow2-util-linux-d0bcd9b32284dbfeec9d76f4adf046fd68528398.tar.gz kernel-qcow2-util-linux-d0bcd9b32284dbfeec9d76f4adf046fd68528398.tar.xz kernel-qcow2-util-linux-d0bcd9b32284dbfeec9d76f4adf046fd68528398.zip | |
tests: add ts_fdisk_clean function to make fdisk output comparable
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Diffstat (limited to 'tests/ts/fdisk')
| -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 |
5 files changed, 5 insertions, 19 deletions
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 |