aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-08-29 09:58:28 -0700
committerRob Landley <rob@landley.net>2019-08-30 13:18:39 -0500
commit1a499d83d40a224110fee7d45ee08a068516ccba (patch)
treeea7fe39ca2a63e148b9c5fe2ae5771fd176a59a3
parentfe60afd4b7b7d4ee6bd271d5aee2d2ff088b563c (diff)
downloadtoybox-1a499d83d40a224110fee7d45ee08a068516ccba.tar.gz
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 :-/
-rwxr-xr-xtests/blkid.test3
1 files changed, 2 insertions, 1 deletions
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
}