Module Name: src
Committed By: christos
Date: Sat Dec 5 18:52:11 UTC 2015
Modified Files:
src/tests/sbin/gpt: Makefile gpt.disklabel t_gpt.sh
Added Files:
src/tests/sbin/gpt: gpt.disklabel.show.normal
Removed Files:
src/tests/sbin/gpt: disklabel
Log Message:
file shuffling
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/sbin/gpt/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/sbin/gpt/disklabel
cvs rdiff -u -r1.1 -r1.2 src/tests/sbin/gpt/gpt.disklabel
cvs rdiff -u -r0 -r1.1 src/tests/sbin/gpt/gpt.disklabel.show.normal
cvs rdiff -u -r1.8 -r1.9 src/tests/sbin/gpt/t_gpt.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sbin/gpt/Makefile
diff -u src/tests/sbin/gpt/Makefile:1.7 src/tests/sbin/gpt/Makefile:1.8
--- src/tests/sbin/gpt/Makefile:1.7 Sat Dec 5 13:45:35 2015
+++ src/tests/sbin/gpt/Makefile Sat Dec 5 13:52:11 2015
@@ -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 @@ FILESDIR= ${TESTSDIR}
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>
Index: src/tests/sbin/gpt/gpt.disklabel
diff -u src/tests/sbin/gpt/gpt.disklabel:1.1 src/tests/sbin/gpt/gpt.disklabel:1.2
--- src/tests/sbin/gpt/gpt.disklabel:1.1 Sat Dec 5 13:45:35 2015
+++ src/tests/sbin/gpt/gpt.disklabel Sat Dec 5 13:52:11 2015
@@ -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*)
Index: src/tests/sbin/gpt/t_gpt.sh
diff -u src/tests/sbin/gpt/t_gpt.sh:1.8 src/tests/sbin/gpt/t_gpt.sh:1.9
--- src/tests/sbin/gpt/t_gpt.sh:1.8 Sat Dec 5 13:45:35 2015
+++ src/tests/sbin/gpt/t_gpt.sh Sat Dec 5 13:52:11 2015
@@ -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 @@ migrate_disklabel_body() {
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() {
Added files:
Index: src/tests/sbin/gpt/gpt.disklabel.show.normal
diff -u /dev/null src/tests/sbin/gpt/gpt.disklabel.show.normal:1.1
--- /dev/null Sat Dec 5 13:52:11 2015
+++ src/tests/sbin/gpt/gpt.disklabel.show.normal Sat Dec 5 13:52:11 2015
@@ -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
