summaryrefslogtreecommitdiffstats
path: root/tests/ts
diff options
context:
space:
mode:
Diffstat (limited to 'tests/ts')
-rwxr-xr-xtests/ts/blkid/md-raid1-part3
-rwxr-xr-xtests/ts/fdisk/align-512-4K3
-rwxr-xr-xtests/ts/fdisk/align-512-4K-633
-rwxr-xr-xtests/ts/fdisk/align-512-4K-md3
-rwxr-xr-xtests/ts/fdisk/align-512-512-topology3
5 files changed, 10 insertions, 5 deletions
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index 86ce4e215..c99082412 100755
--- a/tests/ts/blkid/md-raid1-part
+++ b/tests/ts/blkid/md-raid1-part
@@ -82,7 +82,8 @@ $TS_CMD_BLKID -p -o udev ${DEVICE}2 2>&1 | sort >> $TS_OUTPUT
sleep 3
rmmod scsi_debug
-# remove disk ID and generated UUIDs
+# 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
sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT
diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K
index cae343948..cf3bbc062 100755
--- a/tests/ts/fdisk/align-512-4K
+++ b/tests/ts/fdisk/align-512-4K
@@ -82,7 +82,8 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP
sleep 3
rmmod scsi_debug
-# remove disk ID
+# 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
diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63
index 7142a09b4..cd44ce4d2 100755
--- a/tests/ts/fdisk/align-512-4K-63
+++ b/tests/ts/fdisk/align-512-4K-63
@@ -82,7 +82,8 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP
sleep 3
rmmod scsi_debug
-# remove disk ID
+# 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
diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
index 8a04d9f7e..ba0f0c82a 100755
--- a/tests/ts/fdisk/align-512-4K-md
+++ b/tests/ts/fdisk/align-512-4K-md
@@ -94,7 +94,8 @@ sleep 3
/sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1
rmmod scsi_debug
-# remove disk ID
+# 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
diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology
index 4101ff4f5..45637655b 100755
--- a/tests/ts/fdisk/align-512-512-topology
+++ b/tests/ts/fdisk/align-512-512-topology
@@ -82,7 +82,8 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP
sleep 3
rmmod scsi_debug
-# remove disk ID
+# 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