[PATCH 0/2] Fix test fdisk/bsd ppc64le

[PATCH 0/2] Fix test fdisk/bsd ppc64le

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

A minor thing, maybe for v2.26.1.

This is pull request 177 on github
https://github.com/karelzak/util-linux/pull/177

Ruediger Meier (2):
  tests: improve readability for fdisk/bsd
  tests: fix fdisk/bsd for ppc64le

 tests/ts/fdisk/bsd | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

-- 
1.8.4.5

[PATCH 1/2] tests: improve readability for fdisk/bsd

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 tests/ts/fdisk/bsd | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index 381f228..dcad115 100755
--- a/tests/ts/fdisk/bsd
+++ b/tests/ts/fdisk/bsd
@@ -47,23 +47,27 @@ FDISK_CMD_BSD_LIST_TYPES="b\nl\nq\n"         # list supported PT types and quit
 BYTE_ORDER=$($TS_HELPER_SYSINFO byte-order)
 function fdisk_bsd_offset_and_byte_order_clean
 {
+		# expected md5sums are from x86 systems
+		local md5_bsdimg1_LE_0_64="2e1cee529cb59c9341afef0443f196a1"
+		local md5_bsdimg2_LE_0_64="b5c121c2091b2ff26b880551feac7112"
+
         if [ $BYTE_ORDER = "BE" ] ; then
 		# BSD_LABELSECTOR = 0, BSD_LABELOFFSET = 64
 		sed -i \
-		-e "s/c2273b52976351db75596c47c10b0725/2e1cee529cb59c9341afef0443f196a1/" \
-		-e "s/9a234a5b99e37d2ce0d92b65437b93cd/b5c121c2091b2ff26b880551feac7112/" \
+		-e "s/c2273b52976351db75596c47c10b0725/$md5_bsdimg1_LE_0_64/" \
+		-e "s/9a234a5b99e37d2ce0d92b65437b93cd/$md5_bsdimg2_LE_0_64/" \
 		"$TS_OUTPUT"
 
 		# BSD_LABELSECTOR = 1, BSD_LABELOFFSET = 0
 		sed -i \
-		-e "s/e990c8a1c2106a4cd4b008f16d71aaa6/2e1cee529cb59c9341afef0443f196a1/" \
-		-e "s/187a48c26e83d146b866868addc93702/b5c121c2091b2ff26b880551feac7112/" \
+		-e "s/e990c8a1c2106a4cd4b008f16d71aaa6/$md5_bsdimg1_LE_0_64/" \
+		-e "s/187a48c26e83d146b866868addc93702/$md5_bsdimg2_LE_0_64/" \
 		"$TS_OUTPUT"
 	else
 		# BSD_LABELSECTOR = 0, BSD_LABELOFFSET = 64
 		sed -i \
-		-e "s/78a922a80361cb73049bced72e0f8f1d/2e1cee529cb59c9341afef0443f196a1/" \
-		-e "s/fc2803672a0643ffe46da325629616fc/b5c121c2091b2ff26b880551feac7112/" \
+		-e "s/78a922a80361cb73049bced72e0f8f1d/$md5_bsdimg1_LE_0_64/" \
+		-e "s/fc2803672a0643ffe46da325629616fc/$md5_bsdimg2_LE_0_64/" \
 		"$TS_OUTPUT"
 	fi
 }
-- 
1.8.4.5

[PATCH 2/2] tests: fix fdisk/bsd for ppc64le

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

Actually Aurelien's patch a80886e9 should have addressed this already
because it's the case LE, BSD_LABELSECTOR = 0, BSD_LABELOFFSET = 64.

I've asked about this on mailing list but couldn't get more
informations.
Thread "test fdisk/bsd on exotic archs":
http://comments.gmane.org/gmane.linux.utilities.util-linux-ng/10621

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 tests/ts/fdisk/bsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index dcad115..b76852c 100755
--- a/tests/ts/fdisk/bsd
+++ b/tests/ts/fdisk/bsd
@@ -66,8 +66,8 @@ function fdisk_bsd_offset_and_byte_order_clean
 	else
 		# BSD_LABELSECTOR = 0, BSD_LABELOFFSET = 64
 		sed -i \
-		-e "s/78a922a80361cb73049bced72e0f8f1d/$md5_bsdimg1_LE_0_64/" \
-		-e "s/fc2803672a0643ffe46da325629616fc/$md5_bsdimg2_LE_0_64/" \
+		-e "s/6d760d7a8ef33b27cc6e27f1e8807d48/$md5_bsdimg1_LE_0_64/" \
+		-e "s/3739c7959adb42693a69edb7a99914e8/$md5_bsdimg2_LE_0_64/" \
 		"$TS_OUTPUT"
 	fi
 }
-- 
1.8.4.5

Re: [PATCH 0/2] Fix test fdisk/bsd ppc64le

[Karel Zak]

On Thu, Mar 12, 2015 at 07:08:24PM +0100, Ruediger Meier wrote:
> From: Ruediger Meier <ruediger.meier@ga-group.nl>
> 
> A minor thing, maybe for v2.26.1.

Yep, merged.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com