Re: [U-Boot] [PATCH 3/3 v2] test/fs: strip carriage-return from sandbox output
On Donnerstag, 11. August 2016 22:52:05 CEST you wrote:
DM added carriage-returns to every newline. Strip everything after the 32 character long mdsum.
Signed-off-by: Stefan Brüns stefan.bruens@rwth-aachen.de
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 043e5d0..171b1de 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -402,7 +402,7 @@ check_md5() { # the 7th field is the actual md5 md5_src=`grep -A3 "$1" "$2" | grep "md5 for"` md5_src=($md5_src)
- md5_src=${md5_src[6]}
md5_src=${md5_src[6]:0:32}
# The md5 list, each line is of the form: # - <md5>
This issue has been fixed in a different way.
Superseded-by: 634a4d2e825ba2effc01298ca194cd5cb09f6e3a "fs-test.sh: Correct check_md5() test with newlines"
Kind regards,
Stefan
On Thu, Sep 08, 2016 at 10:28:44PM +0200, Stefan Bruens wrote:
On Donnerstag, 11. August 2016 22:52:05 CEST you wrote:
DM added carriage-returns to every newline. Strip everything after the 32 character long mdsum.
Signed-off-by: Stefan Brüns stefan.bruens@rwth-aachen.de
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 043e5d0..171b1de 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -402,7 +402,7 @@ check_md5() { # the 7th field is the actual md5 md5_src=`grep -A3 "$1" "$2" | grep "md5 for"` md5_src=($md5_src)
- md5_src=${md5_src[6]}
md5_src=${md5_src[6]:0:32}
# The md5 list, each line is of the form: # - <md5>
This issue has been fixed in a different way.
Superseded-by: 634a4d2e825ba2effc01298ca194cd5cb09f6e3a "fs-test.sh: Correct check_md5() test with newlines"
Ug, sorry I missed this. On the plus side, I hit this (and cursed and fixed it) since I'm running fs-test.sh automatically on every batch of commits I bring in now, and it errors if the output changes.
participants (2)
-
Stefan Bruens -
Tom Rini