[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 07/11] test.sh: revert bash 4 only syntax change



The "|&" syntax is bash version 4 specific, and thus fails on
systems running older versions. This change was introduced by
commit af5a11b0051e53a33e20ecac0b8d73da8d33348c.

Tested on RHEL 5 system with bash-3.2-32.el5.

Signed-off-by: Cleber Rosa <crosa redhat com>
---
 test.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test.sh b/test.sh
index 875a3b6..25bec4a 100755
--- a/test.sh
+++ b/test.sh
@@ -82,13 +82,13 @@ oneDisplayTest() {
 
     echo "$testing ... $mode $cfg $correct"
     runme=( ./grubby "$mode" $BIO -c "$cfg" "$@" )
-    if "${runme[ ]}" |& cmp "$correct" > /dev/null; then
+    if "${runme[ ]}" 2>&1 | cmp "$correct" > /dev/null; then
 	(( pass++ ))
 	if $opt_verbose; then
 	    echo -------------------------------------------------------------
 	    echo -n "PASS: "
 	    printf "%q " "${runme[ ]}"; echo
-	    "${runme[ ]}" |& diff -U30 "$cfg" -
+	    "${runme[ ]}" 2>&1 | diff -U30 "$cfg" -
 	    echo
 	fi
     else
@@ -96,7 +96,7 @@ oneDisplayTest() {
 	echo -------------------------------------------------------------
 	echo -n "FAIL: "
 	printf "%q " "${runme[ ]}"; echo
-	"${runme[ ]}" |& diff -U30 "$correct" -
+	"${runme[ ]}" 2>&1 | diff -U30 "$correct" -
 	echo
     fi
 }
-- 
1.7.6.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]