[src/trunk]: src/tests/sbin/gpt file shuffling

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/54c51402d321
branches:  trunk
changeset: 342092:54c51402d321
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Dec 05 18:52:11 2015 +0000

description:
file shuffling

diffstat:

 tests/sbin/gpt/Makefile                  |   4 +-
 tests/sbin/gpt/disklabel                 |  27 ----------------------
 tests/sbin/gpt/gpt.disklabel             |  39 ++++++++++++++++++++++---------
 tests/sbin/gpt/gpt.disklabel.show.normal |  12 +++++++++
 tests/sbin/gpt/t_gpt.sh                  |   6 ++--
 5 files changed, 44 insertions(+), 44 deletions(-)

diffs (128 lines):

diff -r 19f977506dbf -r 54c51402d321 tests/sbin/gpt/Makefile
--- a/tests/sbin/gpt/Makefile   Sat Dec 05 18:47:43 2015 +0000
+++ b/tests/sbin/gpt/Makefile   Sat Dec 05 18:52:11 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 18:45:35 christos Exp $
+# $NetBSD: Makefile,v 1.8 2015/12/05 18:52:11 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -10,6 +10,6 @@
 FILES=         gpt.empty.show.normal gpt.backup gpt.removepart.show.normal
 FILES+=                gpt.2part.show.uuid gpt.2part.show.normal gpt.2part.show.label
 FILES+=                gpt.resizedisk.show.normal gpt.resizepart.show.normal
-FILES+=                disklabel gpt.disklabel
+FILES+=                gpt.disklabel gpt.disklabel.show.normal
 
 .include <bsd.test.mk>
diff -r 19f977506dbf -r 54c51402d321 tests/sbin/gpt/disklabel
--- a/tests/sbin/gpt/disklabel  Sat Dec 05 18:47:43 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# gpt.disk:
-type: ESDI
-disk: WDC WD2500SD-01K
-label: fictitious
-flags:
-bytes/sector: 512
-sectors/track: 63
-tracks/cylinder: 16
-sectors/cylinder: 1000
-cylinders: 10
-total sectors: 10000
-rpm: 3600
-interleave: 1
-trackskew: 0
-cylinderskew: 0
-headswitch: 0          # microseconds
-track-to-track seek: 0 # microseconds
-drivedata: 0 
-
-6 partitions:
-#        size    offset     fstype [fsize bsize cpg/sgs]
- a:       500        63     4.2BSD   1024  8192     0  # (Cyl.      0*-      0*)
- b:      1000       563       swap                     # (Cyl.      0*-      1*)
- c:      1000        63     unused      0     0        # (Cyl.      0*-      1*)
- d:      1063         0     unused      0     0        # (Cyl.      0 -      1*)
- e:      1000      1563     4.2BSD   1024  8192     0  # (Cyl.      1*-      2*)
- f:       400      2563      MSDOS                     # (Cyl.      2*-      2*)
diff -r 19f977506dbf -r 54c51402d321 tests/sbin/gpt/gpt.disklabel
--- a/tests/sbin/gpt/gpt.disklabel      Sat Dec 05 18:47:43 2015 +0000
+++ b/tests/sbin/gpt/gpt.disklabel      Sat Dec 05 18:52:11 2015 +0000
@@ -1,12 +1,27 @@
-  start   size  index  contents
-      0      1         PMBR
-      1      1         Pri GPT header
-      2     32         Pri GPT table
-     34     29         Unused
-     63    500      1  GPT part - NetBSD FFSv1/FFSv2
-    563   1000      2  GPT part - NetBSD swap
-   1563   1000      3  GPT part - NetBSD FFSv1/FFSv2
-   2563    400      4  GPT part - Windows basic data
-   2963   7245         Unused
-  10208     32         Sec GPT table
-  10240      1         Sec GPT header
+# gpt.disk:
+type: ESDI
+disk: WDC WD2500SD-01K
+label: fictitious
+flags:
+bytes/sector: 512
+sectors/track: 63
+tracks/cylinder: 16
+sectors/cylinder: 1000
+cylinders: 10
+total sectors: 10000
+rpm: 3600
+interleave: 1
+trackskew: 0
+cylinderskew: 0
+headswitch: 0          # microseconds
+track-to-track seek: 0 # microseconds
+drivedata: 0 
+
+6 partitions:
+#        size    offset     fstype [fsize bsize cpg/sgs]
+ a:       500        63     4.2BSD   1024  8192     0  # (Cyl.      0*-      0*)
+ b:      1000       563       swap                     # (Cyl.      0*-      1*)
+ c:      1000        63     unused      0     0        # (Cyl.      0*-      1*)
+ d:      1063         0     unused      0     0        # (Cyl.      0 -      1*)
+ e:      1000      1563     4.2BSD   1024  8192     0  # (Cyl.      1*-      2*)
+ f:       400      2563      MSDOS                     # (Cyl.      2*-      2*)
diff -r 19f977506dbf -r 54c51402d321 tests/sbin/gpt/gpt.disklabel.show.normal
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sbin/gpt/gpt.disklabel.show.normal  Sat Dec 05 18:52:11 2015 +0000
@@ -0,0 +1,12 @@
+  start   size  index  contents
+      0      1         PMBR
+      1      1         Pri GPT header
+      2     32         Pri GPT table
+     34     29         Unused
+     63    500      1  GPT part - NetBSD FFSv1/FFSv2
+    563   1000      2  GPT part - NetBSD swap
+   1563   1000      3  GPT part - NetBSD FFSv1/FFSv2
+   2563    400      4  GPT part - Windows basic data
+   2963   7245         Unused
+  10208     32         Sec GPT table
+  10240      1         Sec GPT header
diff -r 19f977506dbf -r 54c51402d321 tests/sbin/gpt/t_gpt.sh
--- a/tests/sbin/gpt/t_gpt.sh   Sat Dec 05 18:47:43 2015 +0000
+++ b/tests/sbin/gpt/t_gpt.sh   Sat Dec 05 18:52:11 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_gpt.sh,v 1.8 2015/12/05 18:45:35 christos Exp $
+# $NetBSD: t_gpt.sh,v 1.9 2015/12/05 18:52:11 christos Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -250,9 +250,9 @@
        prepare
        silence fdisk -fi gpt.disk
        silence fdisk -fu0s 169/63/$((size / 10)) gpt.disk
-       silence disklabel -R gpt.disk "$src/disklabel"
+       silence disklabel -R gpt.disk "$src/gpt.disklabel"
        matcherr "$(migratemsg 5)" gpt migrate "$disk"
-       file "$src/gpt.disklabel" gpt show "$disk"
+       file "$src/gpt.disklabel.show.normal" gpt show "$disk"
 }
 
 atf_init_test_cases() {