[U-Boot] [PATCH] fs-test.sh: Correct check_md5() test with newlines

Tom Rini trini at konsulko.com
Tue Aug 23 01:40:08 CEST 2016


The fs-test.sh script expected there to be a \n\r style newline at the
end of the output. This is no longer the case, so use 'tr' to remove the
\r that we get.

Fixes: (c5917b4b054d "dm: serial-uclass: Move a carriage return before a
        line feed")
Signed-off-by: Tom Rini <trini at konsulko.com>
---
 test/fs/fs-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh
index 043e5d0c0e49..93679cb21e88 100755
--- a/test/fs/fs-test.sh
+++ b/test/fs/fs-test.sh
@@ -400,7 +400,7 @@ check_md5() {
 	# md5sum in u-boot has output of form:
 	# md5 for 01000008 ... 01100007 ==> <md5>
 	# the 7th field is the actual md5
-	md5_src=`grep -A3 "$1" "$2" | grep "md5 for"`
+	md5_src=`grep -A3 "$1" "$2" | grep "md5 for" | tr -d '\r'`
 	md5_src=($md5_src)
 	md5_src=${md5_src[6]}
 
-- 
1.9.1



More information about the U-Boot mailing list