This lets me see the _meaningful_ differences between toybox and e2fsprogs, which is probably good for the health of both.
I've tried to get the whitespace fixed upstream a few times since 2017, but... (The current differences are that e2fsprogs doesn't support f2fs labels, and outputs reiserfs labels after the uuid rather than before.) On the util-linux front, although my patch earlier this month fixed the tests against util-linux 2.32, I now have 2.33 on my laptop, and that's added a new LABEL_FATBOOT field :-/ --- tests/blkid.test | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
From f6dd1675b904ce8c5fe7899187b0dd99a8a9a5e9 Mon Sep 17 00:00:00 2001 From: Elliott Hughes <[email protected]> Date: Thu, 29 Aug 2019 09:58:28 -0700 Subject: [PATCH] blkid.test: allow e2fsprogs' blkid too. This lets me see the _meaningful_ differences between toybox and e2fsprogs, which is probably good for the health of both. I've tried to get the whitespace fixed upstream a few times since 2017, but... (The current differences are that e2fsprogs doesn't support f2fs labels, and outputs reiserfs labels after the uuid rather than before.) On the util-linux front, although my patch earlier this month fixed the tests against util-linux 2.32, I now have 2.33 on my laptop, and that's added a new LABEL_FATBOOT field :-/ --- tests/blkid.test | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/blkid.test b/tests/blkid.test index 6212208e..5bfce435 100755 --- a/tests/blkid.test +++ b/tests/blkid.test @@ -9,7 +9,8 @@ function BLKID() file=$1 shift bzcat $FILES/blkid/$file.bz2 > temp.img - blkid "$@" temp.img + # e2fsprogs' blkid outputs trailing spaces; no other blkid does. + blkid "$@" temp.img | sed 's/ $//' rm temp.img } -- 2.23.0.187.g17f5b7556c-goog
_______________________________________________ Toybox mailing list [email protected] http://lists.landley.net/listinfo.cgi/toybox-landley.net
