Util-Linux package development
 help / color / mirror / Atom feed
From: Ruediger Meier <sweet_f_a@gmx.de>
To: util-linux@vger.kernel.org
Subject: [PATCH 1/2] tests: improve readability for fdisk/bsd
Date: Thu, 12 Mar 2015 19:08:25 +0100	[thread overview]
Message-ID: <1426183706-30366-2-git-send-email-sweet_f_a@gmx.de> (raw)
In-Reply-To: <1426183706-30366-1-git-send-email-sweet_f_a@gmx.de>

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


  reply	other threads:[~2015-03-12 18:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-12 18:08 [PATCH 0/2] Fix test fdisk/bsd ppc64le Ruediger Meier
2015-03-12 18:08 ` Ruediger Meier [this message]
2015-03-12 18:08 ` [PATCH 2/2] tests: fix fdisk/bsd for ppc64le Ruediger Meier
2015-03-13 10:59 ` [PATCH 0/2] Fix test fdisk/bsd ppc64le Karel Zak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1426183706-30366-2-git-send-email-sweet_f_a@gmx.de \
    --to=sweet_f_a@gmx.de \
    --cc=util-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox