From: Karel Zak <kzak@redhat.com>
Date: Tue, 14 Oct 2014 17:52:04 +0000 (+0200)
Subject: tests: update bsd test
X-Git-Tag: v2.26-rc1~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06d199e89a5c9d1f98e985fc6d584049e232ed08;p=thirdparty%2Futil-linux.git

tests: update bsd test

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/expected/fdisk/bsd b/tests/expected/fdisk/bsd
index 679731efa3..eebff09a28 100644
--- a/tests/expected/fdisk/bsd
+++ b/tests/expected/fdisk/bsd
@@ -25,7 +25,6 @@ Disk identifier: <removed>
 
 Device     Boot Start   End Sectors Size Id Type
 <removed>1       2048  4095    2048   1M 83 Linux
-
 -------------------
 
 Create 2st primary partition
@@ -44,13 +43,13 @@ Disk identifier: <removed>
 Device     Boot Start   End Sectors Size Id Type
 <removed>1       2048  4095    2048   1M 83 Linux
 <removed>2       4096 20479   16384   8M a5 FreeBSD
-
 -------------------
 
 Create default BSD
 2e1cee529cb59c9341afef0443f196a1 bsd.img
 
 ---layout----------
+
 Welcome to fdisk <removed>.
 Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
@@ -69,7 +68,6 @@ partitions: 4
 Slice Start   End Sectors  Size Type     Fsize Bsize Cpg
 c      4096 20479   16384    8M unused       0     0   0
 d         0 16064   16065  7.9M unused       0     0   0
-
 Partition table entries are not in disk order.
 
 Command (m for help): Leaving nested disklabel.
@@ -80,6 +78,7 @@ Command (m for help):
 b5c121c2091b2ff26b880551feac7112 bsd.img
 
 ---layout----------
+
 Welcome to fdisk <removed>.
 Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
@@ -99,7 +98,6 @@ Slice Start   End Sectors  Size Type     Fsize Bsize Cpg
 a      4096  6144    2049    1M 4.2BSD       0     0   0
 c      4096 20479   16384    8M unused       0     0   0
 d         0 16064   16065  7.9M unused       0     0   0
-
 Partition table entries are not in disk order.
 
 Command (m for help): Leaving nested disklabel.
diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index 1d5f9a11a0..ec72aca60f 100755
--- a/tests/ts/fdisk/bsd
+++ b/tests/ts/fdisk/bsd
@@ -130,6 +130,6 @@ echo -e "${FDISK_CMD_BSD_LIST_TYPES}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} | \
 	sed 's/Reading .*//g; s/Welcome to fdisk .*//' >> $TS_OUTPUT 2>&1
 
-fdisk_bsd_offset_and_byte_order_clean
+#fdisk_bsd_offset_and_byte_order_clean
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize