This gets the tests passing on the host too, with util-linux 2.32.1 blkid at least, except for the fact that we still don't support ntfs' $VOLUME_NAME attribute. Chasing that is quite a bit more work, and it's time I admitted to myself I'm unlikely to get round to it and just send this patch as is. "Half an eye is better than no eye". --- tests/blkid.test | 10 +++++----- toys/other/blkid.c | 43 ++++++++++++++++++++++++++++++------------- 2 files changed, 35 insertions(+), 18 deletions(-)
From bc0ec1a42848dbd40d7f06cb6ba3edc98a89cbbb Mon Sep 17 00:00:00 2001 From: Elliott Hughes <[email protected]> Date: Tue, 25 Jun 2019 18:13:19 -0700 Subject: [PATCH] blkid.test: match TEST_HOST expectations.
Missing SEC_TYPE for ext3, msdos, and vfat. Missing LABEL for f2fs and ntfs. Wrong endian of UUID for msdos, ntfs, and vfat. --- tests/blkid.test | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/blkid.test b/tests/blkid.test index 436a0950..d11ee40d 100755 --- a/tests/blkid.test +++ b/tests/blkid.test @@ -17,24 +17,26 @@ testing "ext2" "BLKID ext2" \ 'temp.img: LABEL="myext2" UUID="e59093ba-4135-4fdb-bcc4-f20beae4dfaf" TYPE="ext2"\n' \ "" "" testing "ext3" "BLKID ext3" \ - 'temp.img: LABEL="myext3" UUID="79d1c877-1a0f-4e7d-b21d-fc32ae3ef101" TYPE="ext3"\n' \ + 'temp.img: LABEL="myext3" UUID="79d1c877-1a0f-4e7d-b21d-fc32ae3ef101" SEC_TYPE="ext2" TYPE="ext3"\n' \ "" "" testing "ext4" "BLKID ext4" \ 'temp.img: LABEL="myext4" UUID="dc4b7c00-c0c0-4600-af7e-0335f09770fa" TYPE="ext4"\n' \ "" "" testing "f2fs" "BLKID f2fs" \ - 'temp.img: UUID="b53d3619-c204-4c0b-8504-36363578491c" TYPE="f2fs"\n' \ + 'temp.img: LABEL="myf2fs" UUID="b53d3619-c204-4c0b-8504-36363578491c" TYPE="f2fs"\n' \ "" "" testing "msdos" "BLKID msdos" \ - 'temp.img: LABEL="mymsdos" UUID="5108-1e6e" TYPE="vfat"\n' "" "" + 'temp.img: SEC_TYPE="msdos" LABEL="mymsdos" UUID="6E1E-0851" TYPE="vfat"\n' \ + "" "" testing "ntfs" "BLKID ntfs" \ - 'temp.img: UUID="8585600838bfe16e" TYPE="ntfs"\n' "" "" + 'temp.img: LABEL="myntfs" UUID="6EE1BF3808608585" TYPE="ntfs"\n' "" "" testing "reiserfs" "BLKID reiser3" \ 'temp.img: LABEL="myreiser" UUID="a5b99bec-45cc-41d7-986e-32f4b6fc28f2" TYPE="reiserfs"\n' \ "" "" testing "squashfs" "BLKID squashfs" 'temp.img: TYPE="squashfs"\n' "" "" testing "vfat" "BLKID vfat" \ - 'temp.img: LABEL="myvfat" UUID="1db9-5673" TYPE="vfat"\n' "" "" + 'temp.img: SEC_TYPE="msdos" LABEL="myvfat" UUID="7356-B91D" TYPE="vfat"\n' \ + "" "" testing "xfs" "BLKID xfs" \ 'temp.img: LABEL="XFS_test" UUID="d63a1dc3-27d5-4dd4-8b38-f4f97f495c6f" TYPE="xfs"\n' \ "" "" -- 2.22.0.410.gd8fdbe21b5-goog
_______________________________________________ Toybox mailing list [email protected] http://lists.landley.net/listinfo.cgi/toybox-landley.net
