Since not everyone have en_US.UTF-8 locale, default to POSIX locale.
This changes default sort order, so some expected results were updated.
Signed-off-by: Yann Droneaud <yann@xxxxxxxxxxx>
---
tests/expected/blkid/low-probe-cramfs | 2 +-
tests/expected/blkid/low-probe-ext2 | 2 +-
tests/expected/blkid/low-probe-ext3 | 2 +-
tests/expected/blkid/low-probe-fat | 2 +-
tests/expected/blkid/low-probe-gfs2 | 2 +-
tests/expected/blkid/low-probe-hpfs | 2 +-
tests/expected/blkid/low-probe-iso | 2 +-
tests/expected/blkid/low-probe-iso-joliet | 2 +-
tests/expected/blkid/low-probe-iso-rr-joliet | 2 +-
tests/expected/blkid/low-probe-jfs | 2 +-
tests/expected/blkid/low-probe-lvm2 | 2 +-
tests/expected/blkid/low-probe-ntfs | 2 +-
tests/expected/blkid/low-probe-ocfs2 | 2 +-
tests/expected/blkid/low-probe-reiser3 | 2 +-
tests/expected/blkid/low-probe-reiser4 | 2 +-
tests/expected/blkid/low-probe-romfs | 2 +-
tests/expected/blkid/low-probe-small-fat32 | 2 +-
tests/expected/blkid/low-probe-swap1 | 2 +-
tests/expected/blkid/low-probe-udf | 2 +-
tests/expected/blkid/low-probe-vmfs | 2 +-
tests/expected/blkid/low-probe-xfs | 2 +-
tests/expected/blkid/low-probe-zfs | 2 +-
tests/functions.sh | 7 ++++++-
23 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/tests/expected/blkid/low-probe-cramfs b/tests/expected/blkid/low-probe-cramfs
index 09ad018..7898a36 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 fa70cf4..c70b856 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 43aeeed..4bac43f 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 3aecdb4..4201211 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 a19789e..cd5a664 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 f071155..47ae1af 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 31a5116..595a1ac 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 4d21557..2810f79 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 0b3acff..f0b82c9 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 08f9c1e..877fd16 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 5c8e48f..19aed2a 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 019e4ce..aaaa077 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 2463e2a..2328d21 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 7d9e014..d376eca 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 f1d98b9..65d63aa 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 a33b6f3..2eb982b 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 2315c4d..39239e6 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 537f754..e078d99 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 392eac4..ec24963 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 1618e30..41914b0 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 9dbaf44..f21d881 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 bd803da..46727de 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 9e66e43..bf93ef6 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)"
--
1.6.4.4
--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
