From: Amitay Isaacs <amitay@gmail.com>
Date: Thu, 19 Jul 2018 07:41:55 +0000 (+1000)
Subject: ctdb-tests: Strip all spaces from od output
X-Git-Tag: ldb-1.5.0~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3047202ce733d1a767fbc83c7021cb83bb83e0e1;p=thirdparty%2Fsamba.git

ctdb-tests: Strip all spaces from od output

On freebsd, there are trailing spaces in od output.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13520

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/tests/takeover_helper/scripts/local.sh b/ctdb/tests/takeover_helper/scripts/local.sh
index 40ba617573a..bdbff9a4dca 100644
--- a/ctdb/tests/takeover_helper/scripts/local.sh
+++ b/ctdb/tests/takeover_helper/scripts/local.sh
@@ -88,7 +88,7 @@ takeover_helper_out="${TEST_VAR_DIR}/takover_helper.out"
 
 takeover_helper_format_outfd ()
 {
-	od -A n -t d4 "$takeover_helper_out" | sed -e 's|^[[:space:]]*||'
+	od -A n -t d4 "$takeover_helper_out" | sed -e 's|[[:space:]]*||g'
 }
 
 test_takeover_helper ()