svn commit: r291237 - user/ngie/more-tests2/sbin/geom/core/tests/Ref
Garrett Cooper
ngie at FreeBSD.org
Tue Nov 24 07:55:58 UTC 2015
Author: ngie
Date: Tue Nov 24 07:55:55 2015
New Revision: 291237
URL: https://svnweb.freebsd.org/changeset/base/291237
Log:
- Account for stripesize/stripeoffset in diskinfo output
- Remove c partitions from output (/dev/md32c was an alias for
/dev/md32 that was deprecated in 8.x)
Modified:
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha.da0.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.apple.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.beast.da0.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.critter.ad0.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.empty.flp.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.far.ad0.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.flat.da1.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.kern.flp.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.ext.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.flp.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da0.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da1.xml
user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.typo.ad0.xml
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha.da0.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha.da0.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha.da0.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,7 +1,6 @@
$FreeBSD$
-/dev/md34 512 5120 10
-/dev/md34a 512 251658240 491520
-/dev/md34b 512 1086291968 2121664
-/dev/md34c 512 18309995520 35761710
-/dev/md34e 512 20971520 40960
-/dev/md34f 512 16951073792 33107566
+/dev/md34 512 5120 10 0 0
+/dev/md34a 512 251658240 491520 0 0
+/dev/md34b 512 1086291968 2121664 0 0
+/dev/md34e 512 20971520 40960 0 0
+/dev/md34f 512 16951073792 33107566 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,5 +1,4 @@
$FreeBSD$
-/dev/md34 512 5120 10
-/dev/md34a 512 24675840 48195
-/dev/md34b 512 4178442240 8161020
-/dev/md34c 512 74027520 144585
+/dev/md34 512 5120 10 0 0
+/dev/md34a 512 24675840 48195 0 0
+/dev/md34b 512 4178442240 8161020 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.apple.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.apple.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.apple.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,5 +1,5 @@
$FreeBSD$
-/dev/md34 512 366530560 715880
-/dev/md34s1 512 366481408 715784
-/dev/md34s2 512 32256 63
-/dev/md34s3 512 16384 32
+/dev/md34 512 366530560 715880 0 0
+/dev/md34s1 512 366481408 715784 0 0
+/dev/md34s2 512 32256 63 0 0
+/dev/md34s3 512 16384 32 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.beast.da0.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.beast.da0.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.beast.da0.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,5 +1,4 @@
$FreeBSD$
-/dev/md34 512 5120 10
-/dev/md34a 512 4064280576 7938048
-/dev/md34b 512 270925824 529152
-/dev/md34c 512 4335206400 8467200
+/dev/md34 512 5120 10 0 0
+/dev/md34a 512 4064280576 7938048 0 0
+/dev/md34b 512 270925824 529152 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.critter.ad0.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.critter.ad0.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.critter.ad0.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,11 +1,10 @@
$FreeBSD$
-/dev/md34 512 2671841280 5218440
-/dev/md34s1 512 20003848704 39070017
-/dev/md34s1a 512 1073741824 2097152
-/dev/md34s1b 512 1073741824 2097152
-/dev/md34s1c 512 20003848704 39070017
-/dev/md34s1d 512 4447175168 8685889
-/dev/md34s1e 512 524288000 1024000
-/dev/md34s1f 512 4294967296 8388608
-/dev/md34s1g 512 3221225472 6291456
-/dev/md34s1h 512 5368709120 10485760
+/dev/md34 512 2671841280 5218440 0 0
+/dev/md34s1 512 20003848704 39070017 0 0
+/dev/md34s1a 512 1073741824 2097152 0 0
+/dev/md34s1b 512 1073741824 2097152 0 0
+/dev/md34s1d 512 4447175168 8685889 0 0
+/dev/md34s1e 512 524288000 1024000 0 0
+/dev/md34s1f 512 4294967296 8388608 0 0
+/dev/md34s1g 512 3221225472 6291456 0 0
+/dev/md34s1h 512 5368709120 10485760 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.empty.flp.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.empty.flp.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.empty.flp.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,2 +1,2 @@
$FreeBSD$
-/dev/md34 512 1474560 2880 80 2 18
+/dev/md34 512 1474560 2880 0 0 80 2 18
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.far.ad0.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.far.ad0.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.far.ad0.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,4 +1,4 @@
$FreeBSD$
-/dev/md34 512 5632 11
-/dev/md34s1 512 296821760 579730
-/dev/md34s2 512 4564740096 8915508
+/dev/md34 512 5632 11 0 0
+/dev/md34s1 512 296821760 579730 0 0
+/dev/md34s2 512 4564740096 8915508 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.flat.da1.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.flat.da1.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.flat.da1.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,12 +1,10 @@
$FreeBSD$
-/dev/md34 512 37888 74
-/dev/md34a 512 37748736 73728
-/dev/md34b 512 268435456 524288
-/dev/md34c 512 8422686720 16450560
-/dev/md34h 512 8115978240 15851520
-/dev/md34s1 512 18367017984 35873082
-/dev/md34s1b 512 419430400 819200
-/dev/md34s1c 512 18367017984 35873082
-/dev/md34s1e 512 419430400 819200
-/dev/md34s1f 512 1073741824 2097152
-/dev/md34s1g 512 16454415360 32137530
+/dev/md34 512 37888 74 0 0
+/dev/md34a 512 37748736 73728 0 0
+/dev/md34b 512 268435456 524288 0 0
+/dev/md34h 512 8115978240 15851520 0 0
+/dev/md34s1 512 18367017984 35873082 0 0
+/dev/md34s1b 512 419430400 819200 0 0
+/dev/md34s1e 512 419430400 819200 0 0
+/dev/md34s1f 512 1073741824 2097152 0 0
+/dev/md34s1g 512 16454415360 32137530 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.kern.flp.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.kern.flp.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.kern.flp.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,5 +1,4 @@
$FreeBSD$
-/dev/md34 512 5632 11
-/dev/md34a 512 1474560 2880
-/dev/md34b 512 1474560 2880
-/dev/md34c 512 1474560 2880
+/dev/md34 512 5632 11 0 0
+/dev/md34a 512 1474560 2880 0 0
+/dev/md34b 512 1474560 2880 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.ext.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.ext.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.ext.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,27 +1,27 @@
$FreeBSD$
-/dev/md34 512 2327759360 4546405
-/dev/md34s1 512 2146765824 4192902
-/dev/md34s10 512 8193024 16002
-/dev/md34s11 512 8193024 16002
-/dev/md34s12 512 8193024 16002
-/dev/md34s13 512 8193024 16002
-/dev/md34s14 512 8193024 16002
-/dev/md34s15 512 8193024 16002
-/dev/md34s16 512 8193024 16002
-/dev/md34s17 512 8193024 16002
-/dev/md34s18 512 8193024 16002
-/dev/md34s19 512 8193024 16002
-/dev/md34s2 512 427714560 835380
-/dev/md34s20 512 8193024 16002
-/dev/md34s21 512 8193024 16002
-/dev/md34s22 512 8193024 16002
-/dev/md34s23 512 8193024 16002
-/dev/md34s24 512 8193024 16002
-/dev/md34s25 512 8193024 16002
-/dev/md34s26 512 8193024 16002
-/dev/md34s27 512 8193024 16002
-/dev/md34s5 512 8193024 16002
-/dev/md34s6 512 8193024 16002
-/dev/md34s7 512 8193024 16002
-/dev/md34s8 512 8193024 16002
-/dev/md34s9 512 8193024 16002
+/dev/md34 512 2327759360 4546405 0 0
+/dev/md34s1 512 2146765824 4192902 0 0
+/dev/md34s10 512 8193024 16002 0 0
+/dev/md34s11 512 8193024 16002 0 0
+/dev/md34s12 512 8193024 16002 0 0
+/dev/md34s13 512 8193024 16002 0 0
+/dev/md34s14 512 8193024 16002 0 0
+/dev/md34s15 512 8193024 16002 0 0
+/dev/md34s16 512 8193024 16002 0 0
+/dev/md34s17 512 8193024 16002 0 0
+/dev/md34s18 512 8193024 16002 0 0
+/dev/md34s19 512 8193024 16002 0 0
+/dev/md34s2 512 427714560 835380 0 0
+/dev/md34s20 512 8193024 16002 0 0
+/dev/md34s21 512 8193024 16002 0 0
+/dev/md34s22 512 8193024 16002 0 0
+/dev/md34s23 512 8193024 16002 0 0
+/dev/md34s24 512 8193024 16002 0 0
+/dev/md34s25 512 8193024 16002 0 0
+/dev/md34s26 512 8193024 16002 0 0
+/dev/md34s27 512 8193024 16002 0 0
+/dev/md34s5 512 8193024 16002 0 0
+/dev/md34s6 512 8193024 16002 0 0
+/dev/md34s7 512 8193024 16002 0 0
+/dev/md34s8 512 8193024 16002 0 0
+/dev/md34s9 512 8193024 16002 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.flp.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.flp.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.flp.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,2 +1,2 @@
$FreeBSD$
-/dev/md34 512 5632 11
+/dev/md34 512 5632 11 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,8 +1,7 @@
$FreeBSD$
-/dev/md34 512 75264 147 1 8 17
-/dev/md34s1 512 1626603520 3176960 23360 8 17
-/dev/md34s1a 512 78643200 153600 1129 8 17
-/dev/md34s1b 512 104857600 204800 1505 8 17
-/dev/md34s1c 512 1626603520 3176960 23360 8 17
-/dev/md34s1e 512 52428800 102400 752 8 17
-/dev/md34s1f 512 1390673920 2716160 19971 8 17
+/dev/md34 512 75264 147 0 0 1 8 17
+/dev/md34s1 512 1626603520 3176960 23360 0 0 8 17
+/dev/md34s1a 512 78643200 153600 1129 0 0 8 17
+/dev/md34s1b 512 104857600 204800 1505 0 0 8 17
+/dev/md34s1e 512 52428800 102400 752 0 0 8 17
+/dev/md34s1f 512 1390673920 2716160 19971 0 0 8 17
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da0.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da0.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da0.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,6 +1,5 @@
$FreeBSD$
-/dev/md34 512 5120 10
-/dev/md34a 512 1529708544 2987712
-/dev/md34b 512 539320320 1053360
-/dev/md34c 512 36698296320 71676360
-/dev/md34h 512 34629267456 67635288
+/dev/md34 512 5120 10 0 0
+/dev/md34a 512 1529708544 2987712 0 0
+/dev/md34b 512 539320320 1053360 0 0
+/dev/md34h 512 34629267456 67635288 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da1.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da1.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da1.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,9 +1,8 @@
$FreeBSD$
-/dev/md34 512 5120 10
-/dev/md34a 512 262967296 513608
-/dev/md34b 512 1075994624 2101552
-/dev/md34c 512 18108555264 35368272
-/dev/md34d 512 11124240384 21727032
-/dev/md34f 512 2149576704 4198392
-/dev/md34g 512 2149576704 4198392
-/dev/md34h 512 1343787008 2624584
+/dev/md34 512 5120 10 0 0
+/dev/md34a 512 262967296 513608 0 0
+/dev/md34b 512 1075994624 2101552 0 0
+/dev/md34d 512 11124240384 21727032 0 0
+/dev/md34f 512 2149576704 4198392 0 0
+/dev/md34g 512 2149576704 4198392 0 0
+/dev/md34h 512 1343787008 2624584 0 0
Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.typo.ad0.xml
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.typo.ad0.xml Tue Nov 24 05:12:40 2015 (r291236)
+++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.typo.ad0.xml Tue Nov 24 07:55:55 2015 (r291237)
@@ -1,14 +1,11 @@
$FreeBSD$
-/dev/md34 512 8585262592 16768091
-/dev/md34s1 512 3220406784 6289857
-/dev/md34s1a 512 104857600 204800
-/dev/md34s1b 512 524288000 1024000
-/dev/md34s1c 512 3220406784 6289857
-/dev/md34s1e 512 524288000 1024000
-/dev/md34s1f 512 2066973184 4037057
-/dev/md34s2 512 5364817920 10478160
-/dev/md34s2c 512 5364817920 10478160
-/dev/md34s3 512 8585256960 16768080
-/dev/md34s3a 512 2097152000 4096000
-/dev/md34s3c 512 8585256960 16768080
-/dev/md34s3d 512 6488104960 12672080
+/dev/md34 512 8585262592 16768091 0 0
+/dev/md34s1 512 3220406784 6289857 0 0
+/dev/md34s1a 512 104857600 204800 0 0
+/dev/md34s1b 512 524288000 1024000 0 0
+/dev/md34s1e 512 524288000 1024000 0 0
+/dev/md34s1f 512 2066973184 4037057 0 0
+/dev/md34s2 512 5364817920 10478160 0 0
+/dev/md34s3 512 8585256960 16768080 0 0
+/dev/md34s3a 512 2097152000 4096000 0 0
+/dev/md34s3d 512 6488104960 12672080 0 0
More information about the svn-src-user
mailing list