diff options
23 files changed, 28 insertions, 23 deletions
diff --git a/tests/expected/blkid/low-probe-cramfs b/tests/expected/blkid/low-probe-cramfs index 09ad018c0..7898a3672 100644 --- a/tests/expected/blkid/low-probe-cramfs +++ b/tests/expected/blkid/low-probe-cramfs @@ -1,4 +1,4 @@ -ID_FS_LABEL_ENC=test-cram ID_FS_LABEL=test-cram +ID_FS_LABEL_ENC=test-cram ID_FS_TYPE=cramfs ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-ext2 b/tests/expected/blkid/low-probe-ext2 index fa70cf4f0..c70b85698 100644 --- a/tests/expected/blkid/low-probe-ext2 +++ b/tests/expected/blkid/low-probe-ext2 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=test-ext2 ID_FS_LABEL=test-ext2 +ID_FS_LABEL_ENC=test-ext2 ID_FS_TYPE=ext2 ID_FS_USAGE=filesystem ID_FS_UUID=22f0eac3-5c89-4ec1-9076-60799119aaea diff --git a/tests/expected/blkid/low-probe-ext3 b/tests/expected/blkid/low-probe-ext3 index 43aeeedaa..4bac43f57 100644 --- a/tests/expected/blkid/low-probe-ext3 +++ b/tests/expected/blkid/low-probe-ext3 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=test-ext3 ID_FS_LABEL=test-ext3 +ID_FS_LABEL_ENC=test-ext3 ID_FS_SEC_TYPE=ext2 ID_FS_TYPE=ext3 ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-fat b/tests/expected/blkid/low-probe-fat index 3aecdb45e..420121117 100644 --- a/tests/expected/blkid/low-probe-fat +++ b/tests/expected/blkid/low-probe-fat @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=TEST-FAT ID_FS_LABEL=TEST-FAT +ID_FS_LABEL_ENC=TEST-FAT ID_FS_SEC_TYPE=msdos ID_FS_TYPE=vfat ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-gfs2 b/tests/expected/blkid/low-probe-gfs2 index a19789ef8..cd5a664b4 100644 --- a/tests/expected/blkid/low-probe-gfs2 +++ b/tests/expected/blkid/low-probe-gfs2 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=mycluster:mygfs2 ID_FS_LABEL=mycluster:mygfs2 +ID_FS_LABEL_ENC=mycluster:mygfs2 ID_FS_TYPE=gfs2 ID_FS_USAGE=filesystem ID_FS_VERSION=1 diff --git a/tests/expected/blkid/low-probe-hpfs b/tests/expected/blkid/low-probe-hpfs index f07115551..47ae1af28 100644 --- a/tests/expected/blkid/low-probe-hpfs +++ b/tests/expected/blkid/low-probe-hpfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=P01\x20S16A ID_FS_LABEL=P01_S16A +ID_FS_LABEL_ENC=P01\x20S16A ID_FS_TYPE=hpfs ID_FS_USAGE=filesystem ID_FS_UUID=3BC2-32D5 diff --git a/tests/expected/blkid/low-probe-iso b/tests/expected/blkid/low-probe-iso index 31a511604..595a1acfe 100644 --- a/tests/expected/blkid/low-probe-iso +++ b/tests/expected/blkid/low-probe-iso @@ -1,4 +1,4 @@ -ID_FS_LABEL_ENC=IsoVolumeName ID_FS_LABEL=IsoVolumeName +ID_FS_LABEL_ENC=IsoVolumeName ID_FS_TYPE=iso9660 ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-iso-joliet b/tests/expected/blkid/low-probe-iso-joliet index 4d21557c5..2810f792e 100644 --- a/tests/expected/blkid/low-probe-iso-joliet +++ b/tests/expected/blkid/low-probe-iso-joliet @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=ThisWonderfulLabelIsVeryVeryLong ID_FS_LABEL=ThisWonderfulLabelIsVeryVeryLong +ID_FS_LABEL_ENC=ThisWonderfulLabelIsVeryVeryLong ID_FS_TYPE=iso9660 ID_FS_USAGE=filesystem ID_FS_VERSION=Joliet\x20Extension diff --git a/tests/expected/blkid/low-probe-iso-rr-joliet b/tests/expected/blkid/low-probe-iso-rr-joliet index 0b3acffa7..f0b82c965 100644 --- a/tests/expected/blkid/low-probe-iso-rr-joliet +++ b/tests/expected/blkid/low-probe-iso-rr-joliet @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=ThisIsVolumeName ID_FS_LABEL=ThisIsVolumeName +ID_FS_LABEL_ENC=ThisIsVolumeName ID_FS_TYPE=iso9660 ID_FS_USAGE=filesystem ID_FS_VERSION=Joliet\x20Extension diff --git a/tests/expected/blkid/low-probe-jfs b/tests/expected/blkid/low-probe-jfs index 08f9c1e6c..877fd168e 100644 --- a/tests/expected/blkid/low-probe-jfs +++ b/tests/expected/blkid/low-probe-jfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=test-jfs ID_FS_LABEL=test-jfs +ID_FS_LABEL_ENC=test-jfs ID_FS_TYPE=jfs ID_FS_USAGE=filesystem ID_FS_UUID=9bf7b82e-7583-4c74-99a4-189a691f27b5 diff --git a/tests/expected/blkid/low-probe-lvm2 b/tests/expected/blkid/low-probe-lvm2 index 5c8e48f95..19aed2aa4 100644 --- a/tests/expected/blkid/low-probe-lvm2 +++ b/tests/expected/blkid/low-probe-lvm2 @@ -1,5 +1,5 @@ ID_FS_TYPE=LVM2_member ID_FS_USAGE=raid -ID_FS_UUID_ENC=Vynv4k-APH8-xQER-HSBb-8VJ3-SvFF-PB5O1U ID_FS_UUID=Vynv4k-APH8-xQER-HSBb-8VJ3-SvFF-PB5O1U +ID_FS_UUID_ENC=Vynv4k-APH8-xQER-HSBb-8VJ3-SvFF-PB5O1U ID_FS_VERSION=LVM2\x20001 diff --git a/tests/expected/blkid/low-probe-ntfs b/tests/expected/blkid/low-probe-ntfs index 019e4cec2..aaaa077da 100644 --- a/tests/expected/blkid/low-probe-ntfs +++ b/tests/expected/blkid/low-probe-ntfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=Новый\x20том ID_FS_LABEL=Новый_том +ID_FS_LABEL_ENC=Новый\x20том ID_FS_TYPE=ntfs ID_FS_USAGE=filesystem ID_FS_UUID=09CBB6DE30C87310 diff --git a/tests/expected/blkid/low-probe-ocfs2 b/tests/expected/blkid/low-probe-ocfs2 index 2463e2add..2328d21a0 100644 --- a/tests/expected/blkid/low-probe-ocfs2 +++ b/tests/expected/blkid/low-probe-ocfs2 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=test-ocfs2 ID_FS_LABEL=test-ocfs2 +ID_FS_LABEL_ENC=test-ocfs2 ID_FS_TYPE=ocfs2 ID_FS_USAGE=filesystem ID_FS_UUID=6b6bfbea-3a79-4f0c-b166-a20776102445 diff --git a/tests/expected/blkid/low-probe-reiser3 b/tests/expected/blkid/low-probe-reiser3 index 7d9e01471..d376ecae1 100644 --- a/tests/expected/blkid/low-probe-reiser3 +++ b/tests/expected/blkid/low-probe-reiser3 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=TESTREISER ID_FS_LABEL=TESTREISER +ID_FS_LABEL_ENC=TESTREISER ID_FS_TYPE=reiserfs ID_FS_USAGE=filesystem ID_FS_UUID=9efe7863-b124-46dc-ad68-8ecd04230a7b diff --git a/tests/expected/blkid/low-probe-reiser4 b/tests/expected/blkid/low-probe-reiser4 index f1d98b94c..65d63aa65 100644 --- a/tests/expected/blkid/low-probe-reiser4 +++ b/tests/expected/blkid/low-probe-reiser4 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=TESTR4 ID_FS_LABEL=TESTR4 +ID_FS_LABEL_ENC=TESTR4 ID_FS_TYPE=reiser4 ID_FS_USAGE=filesystem ID_FS_UUID=9722633c-d69a-4881-b1c8-bedecbbf39d2 diff --git a/tests/expected/blkid/low-probe-romfs b/tests/expected/blkid/low-probe-romfs index a33b6f3d3..2eb982bc1 100644 --- a/tests/expected/blkid/low-probe-romfs +++ b/tests/expected/blkid/low-probe-romfs @@ -1,4 +1,4 @@ -ID_FS_LABEL_ENC=test-romfs ID_FS_LABEL=test-romfs +ID_FS_LABEL_ENC=test-romfs ID_FS_TYPE=romfs ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-small-fat32 b/tests/expected/blkid/low-probe-small-fat32 index 2315c4d54..39239e6b3 100644 --- a/tests/expected/blkid/low-probe-small-fat32 +++ b/tests/expected/blkid/low-probe-small-fat32 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=TESTVFAT ID_FS_LABEL=TESTVFAT +ID_FS_LABEL_ENC=TESTVFAT ID_FS_TYPE=vfat ID_FS_USAGE=filesystem ID_FS_UUID=1423-AAE1 diff --git a/tests/expected/blkid/low-probe-swap1 b/tests/expected/blkid/low-probe-swap1 index 537f754d7..e078d9993 100644 --- a/tests/expected/blkid/low-probe-swap1 +++ b/tests/expected/blkid/low-probe-swap1 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=SWAP-TEST ID_FS_LABEL=SWAP-TEST +ID_FS_LABEL_ENC=SWAP-TEST ID_FS_TYPE=swap ID_FS_USAGE=other ID_FS_UUID=8ff8e77f-8553-485e-8656-58be67a81666 diff --git a/tests/expected/blkid/low-probe-udf b/tests/expected/blkid/low-probe-udf index 392eac4f2..ec2496395 100644 --- a/tests/expected/blkid/low-probe-udf +++ b/tests/expected/blkid/low-probe-udf @@ -1,4 +1,4 @@ -ID_FS_LABEL_ENC=test-udf ID_FS_LABEL=test-udf +ID_FS_LABEL_ENC=test-udf ID_FS_TYPE=udf ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-vmfs b/tests/expected/blkid/low-probe-vmfs index 1618e30cc..41914b0fd 100644 --- a/tests/expected/blkid/low-probe-vmfs +++ b/tests/expected/blkid/low-probe-vmfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=toto ID_FS_LABEL=toto +ID_FS_LABEL_ENC=toto ID_FS_TYPE=VMFS ID_FS_USAGE=filesystem ID_FS_UUID=49edf844-ebfc28f3-65cb-0021280083cf diff --git a/tests/expected/blkid/low-probe-xfs b/tests/expected/blkid/low-probe-xfs index 9dbaf445f..f21d881a5 100644 --- a/tests/expected/blkid/low-probe-xfs +++ b/tests/expected/blkid/low-probe-xfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=test-xfs ID_FS_LABEL=test-xfs +ID_FS_LABEL_ENC=test-xfs ID_FS_TYPE=xfs ID_FS_USAGE=filesystem ID_FS_UUID=8c8a0a5a-9f57-492e-9610-45a61f38f58a diff --git a/tests/expected/blkid/low-probe-zfs b/tests/expected/blkid/low-probe-zfs index bd803da96..46727de8d 100644 --- a/tests/expected/blkid/low-probe-zfs +++ b/tests/expected/blkid/low-probe-zfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=tank ID_FS_LABEL=tank +ID_FS_LABEL_ENC=tank ID_FS_TYPE=zfs_member ID_FS_USAGE=raid ID_FS_UUID=1782036546311300980 diff --git a/tests/functions.sh b/tests/functions.sh index 9e66e432f..bf93ef63a 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -78,7 +78,12 @@ function ts_has_option { function ts_init_env { local mydir=$(ts_abspath $(dirname $0)) - export LANG="en_US.UTF-8" + LANG="POSIX" + LANGUAGE="POSIX" + LC_ALL="POSIX" + CHARSET="UTF-8" + + export LANG LANGUAGE LC_ALL CHARSET TS_TOPDIR=$(ts_abspath $mydir/../../) TS_SCRIPT="$mydir/$(basename $0)" |