From 9dc24d994efc3837e248ef8db9b3976e8775235e Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 10 Aug 2019 10:21:44 -0700 Subject: blkid: add -s, SEC_TYPE, f2fs LABEL, and fix vfat/ntfs UUID. This gets the tests passing with both toybox and util-linux 2.32.1 blkid. We use -s to get around the fact that we still don't support ntfs' $VOLUME_NAME attribute. --- tests/blkid.test | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/blkid.test b/tests/blkid.test index d11ee40d..6212208e 100755 --- a/tests/blkid.test +++ b/tests/blkid.test @@ -6,8 +6,10 @@ function BLKID() { - bzcat $FILES/blkid/$1.bz2 > temp.img - blkid temp.img + file=$1 + shift + bzcat $FILES/blkid/$file.bz2 > temp.img + blkid "$@" temp.img rm temp.img } @@ -28,8 +30,10 @@ testing "f2fs" "BLKID f2fs" \ testing "msdos" "BLKID msdos" \ 'temp.img: SEC_TYPE="msdos" LABEL="mymsdos" UUID="6E1E-0851" TYPE="vfat"\n' \ "" "" -testing "ntfs" "BLKID ntfs" \ - 'temp.img: LABEL="myntfs" UUID="6EE1BF3808608585" TYPE="ntfs"\n' "" "" + +# We use -s here because toybox blkid can't do ntfs volume labels yet. +testing "ntfs" "BLKID ntfs -s UUID -s TYPE" \ + 'temp.img: UUID="6EE1BF3808608585" TYPE="ntfs"\n' "" "" testing "reiserfs" "BLKID reiser3" \ 'temp.img: LABEL="myreiser" UUID="a5b99bec-45cc-41d7-986e-32f4b6fc28f2" TYPE="reiserfs"\n' \ "" "" -- cgit v1.2.3