summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2015-12-05 18:52:11 +0000
committerchristos <christos@NetBSD.org>2015-12-05 18:52:11 +0000
commit863c57504b88481a7d7baf9372a86f8d9690beb7 (patch)
tree768ddfdb955919296c82ab399eca1619f5053f1b
parent412a8e6329cf95b7c3171b744d70a200b21bd7a3 (diff)
file shuffling
-rw-r--r--tests/sbin/gpt/Makefile4
-rw-r--r--tests/sbin/gpt/disklabel27
-rw-r--r--tests/sbin/gpt/gpt.disklabel39
-rw-r--r--tests/sbin/gpt/gpt.disklabel.show.normal12
-rw-r--r--tests/sbin/gpt/t_gpt.sh6
5 files changed, 44 insertions, 44 deletions
diff --git a/tests/sbin/gpt/Makefile b/tests/sbin/gpt/Makefile
index 55ca1b5e911..c6b6cab353d 100644
--- a/tests/sbin/gpt/Makefile
+++ b/tests/sbin/gpt/Makefile
@@ -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>
diff --git a/tests/sbin/gpt/disklabel b/tests/sbin/gpt/disklabel
deleted file mode 100644
index 4a598eed638..00000000000
--- a/tests/sbin/gpt/disklabel
+++ /dev/null
@@ -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 --git a/tests/sbin/gpt/gpt.disklabel b/tests/sbin/gpt/gpt.disklabel
index 5d937077f6c..4a598eed638 100644
--- a/tests/sbin/gpt/gpt.disklabel
+++ b/tests/sbin/gpt/gpt.disklabel
@@ -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 --git a/tests/sbin/gpt/gpt.disklabel.show.normal b/tests/sbin/gpt/gpt.disklabel.show.normal
new file mode 100644
index 00000000000..5d937077f6c
--- /dev/null
+++ b/tests/sbin/gpt/gpt.disklabel.show.normal
@@ -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 --git a/tests/sbin/gpt/t_gpt.sh b/tests/sbin/gpt/t_gpt.sh
index 7423fef2d42..34e6701aa36 100644
--- a/tests/sbin/gpt/t_gpt.sh
+++ b/tests/sbin/gpt/t_gpt.sh
@@ -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() {