diff options
| author | Elliott Hughes <enh@google.com> | 2019-08-10 10:21:44 -0700 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2019-08-12 03:34:02 -0500 |
| commit | 9dc24d994efc3837e248ef8db9b3976e8775235e (patch) | |
| tree | 04f04bc1e17e53c1a2bda0f01b37a46a9d4adc52 /tests | |
| parent | ae39913b0582b7f47e2d1f35ffaefeb848039b90 (diff) | |
| download | toybox-9dc24d994efc3837e248ef8db9b3976e8775235e.tar.gz | |
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.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/blkid.test | 12 |
1 files changed, 8 insertions, 4 deletions
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' \ "" "" |