Signed-off-by: Francesco Cosoleto <cosoleto@xxxxxxxxx>
---
tests/expected/blkid/md-raid1-part | 6 +++---
tests/expected/fdisk/align-512-4K | 16 ++++++++--------
tests/expected/fdisk/align-512-4K-63 | 16 ++++++++--------
tests/expected/fdisk/align-512-4K-md | 6 +++---
tests/expected/fdisk/align-512-512-topology | 16 ++++++++--------
tests/ts/blkid/md-raid1-part | 3 ++-
tests/ts/fdisk/align-512-4K | 3 ++-
tests/ts/fdisk/align-512-4K-63 | 3 ++-
tests/ts/fdisk/align-512-4K-md | 3 ++-
tests/ts/fdisk/align-512-512-topology | 3 ++-
10 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index f1d4cbb..96033ef 100644
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -18,7 +18,7 @@ Partition number (1-4, default 2): First sector (53248-104447, default 53248): U
Last sector, +sectors or +size{K,M,G} (53248-104447, default 104447): Using default value 104447
Command (m for help):
-Disk /dev/sdb: 53 MB, 53477376 bytes
+Disk /dev/...: 53 MB, 53477376 bytes
32 heads, 32 sectors/track, 102 cylinders, total 104448 sectors
Units = sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
@@ -26,8 +26,8 @@ I/O size (minimum/optimal): 512 bytes / 32768 bytes
Device Boot Start End Blocks Id System
-/dev/sdb1 2048 53247 25600 83 Linux
-/dev/sdb2 53248 104447 25600 83 Linux
+/dev/...1 2048 53247 25600 83 Linux
+/dev/...2 53248 104447 25600 83 Linux
Command (m for help): The partition table has been altered!
diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index 7be7c03..c5b9e04 100644
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -40,7 +40,7 @@ Command (m for help): First sector (90112-102399, default 90112): Using default
Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399
Command (m for help):
-Disk /dev/sdb: 52 MB, 52428800 bytes
+Disk /dev/...: 52 MB, 52428800 bytes
32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors
Units = sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 4096 bytes
@@ -48,13 +48,13 @@ I/O size (minimum/optimal): 4096 bytes / 32768 bytes
Device Boot Start End Blocks Id System
-/dev/sdb1 2048 22527 10240 83 Linux
-/dev/sdb2 22528 43007 10240 83 Linux
-/dev/sdb3 43008 63487 10240 83 Linux
-/dev/sdb4 63488 102399 19456 5 Extended
-/dev/sdb5 65536 75775 5120 83 Linux
-/dev/sdb6 77824 88063 5120 83 Linux
-/dev/sdb7 90112 102399 6144 83 Linux
+/dev/...1 2048 22527 10240 83 Linux
+/dev/...2 22528 43007 10240 83 Linux
+/dev/...3 43008 63487 10240 83 Linux
+/dev/...4 63488 102399 19456 5 Extended
+/dev/...5 65536 75775 5120 83 Linux
+/dev/...6 77824 88063 5120 83 Linux
+/dev/...7 90112 102399 6144 83 Linux
Command (m for help): The partition table has been altered!
diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index 51e75f9..b337943 100644
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -40,7 +40,7 @@ Command (m for help): First sector (61454-102399, default 88063): Using default
Last sector, +sectors or +size{K,M,G} (88063-102399, default 102399): Using default value 102399
Command (m for help):
-Disk /dev/sdb: 52 MB, 52428800 bytes
+Disk /dev/...: 52 MB, 52428800 bytes
32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors
Units = sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 4096 bytes
@@ -49,13 +49,13 @@ Alignment offset: 3584 bytes
Device Boot Start End Blocks Id System
-/dev/sdb1 7 20486 10240 83 Linux
-/dev/sdb2 20487 40966 10240 83 Linux
-/dev/sdb3 40967 61446 10240 83 Linux
-/dev/sdb4 61447 102399 20476+ 5 Extended
-/dev/sdb5 63487 73726 5120 83 Linux
-/dev/sdb6 75775 86014 5120 83 Linux
-/dev/sdb7 88063 102399 7168+ 83 Linux
+/dev/...1 7 20486 10240 83 Linux
+/dev/...2 20487 40966 10240 83 Linux
+/dev/...3 40967 61446 10240 83 Linux
+/dev/...4 61447 102399 20476+ 5 Extended
+/dev/...5 63487 73726 5120 83 Linux
+/dev/...6 75775 86014 5120 83 Linux
+/dev/...7 88063 102399 7168+ 83 Linux
Command (m for help): The partition table has been altered!
diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index db43ec6..8516053 100644
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -22,7 +22,7 @@ Partition number (1-4, default 2): First sector (43008-102399, default 43008): U
Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Using default value 102399
Command (m for help):
-Disk /dev/sdb: 52 MB, 52428800 bytes
+Disk /dev/...: 52 MB, 52428800 bytes
32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors
Units = sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 4096 bytes
@@ -30,8 +30,8 @@ I/O size (minimum/optimal): 4096 bytes / 32768 bytes
Device Boot Start End Blocks Id System
-/dev/sdb1 2048 43007 20480 83 Linux
-/dev/sdb2 43008 102399 29696 83 Linux
+/dev/...1 2048 43007 20480 83 Linux
+/dev/...2 43008 102399 29696 83 Linux
Command (m for help): The partition table has been altered!
diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index f37b5a3..bc631cf 100644
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -36,7 +36,7 @@ Command (m for help): First sector (90112-102399, default 90112): Using default
Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399
Command (m for help):
-Disk /dev/sdb: 52 MB, 52428800 bytes
+Disk /dev/...: 52 MB, 52428800 bytes
32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors
Units = sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
@@ -44,13 +44,13 @@ I/O size (minimum/optimal): 512 bytes / 32768 bytes
Device Boot Start End Blocks Id System
-/dev/sdb1 2048 22527 10240 83 Linux
-/dev/sdb2 22528 43007 10240 83 Linux
-/dev/sdb3 43008 63487 10240 83 Linux
-/dev/sdb4 63488 102399 19456 5 Extended
-/dev/sdb5 65536 75775 5120 83 Linux
-/dev/sdb6 77824 88063 5120 83 Linux
-/dev/sdb7 90112 102399 6144 83 Linux
+/dev/...1 2048 22527 10240 83 Linux
+/dev/...2 22528 43007 10240 83 Linux
+/dev/...3 43008 63487 10240 83 Linux
+/dev/...4 63488 102399 19456 5 Extended
+/dev/...5 65536 75775 5120 83 Linux
+/dev/...6 77824 88063 5120 83 Linux
+/dev/...7 90112 102399 6144 83 Linux
Command (m for help): The partition table has been altered!
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index 86ce4e2..c990824 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 cae3439..78e80b9 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 7142a09..c71ff77 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 8a04d9f..f007319 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 4101ff4..44ebddc 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
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
