tests: use POSIX locale

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@droneaud.fr>

diff --git a/tests/expected/blkid/low-probe-cramfs b/tests/expected/blkid/low-probe-cramfs
index 09ad018c07483c0806f72ace4554b1f3c55b103b..7898a36720bed93be4d5df40966a3cf7656fcbde 100644 (file)
--- 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 fa70cf4f0b09fb151d60b880a9b260c4696c9f2c..c70b8569865accc833f638116fb35fc74cd9efc0 100644 (file)
--- 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 43aeeedaa40afca6ac55c15136f17063e3c317aa..4bac43f57b2f0e42e35d601054d3671dcb602b9a 100644 (file)
--- 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 3aecdb45e4e5f3e3fbbedc3d218249c890ab59b5..420121117f0188fd53fd91367e11cff98f0fa880 100644 (file)
--- 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 a19789ef801219cdf349ec3021014407068236a9..cd5a664b4f3cdcc50b07edc2334987feb935439d 100644 (file)
--- 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 f07115551af616a22eaeb58b9bdbfdc6996be15a..47ae1af281e4d38c1439b745c3d20f7b9eab2eb3 100644 (file)
--- 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 31a511604ffa062902d804c6a84522fe51ad1940..595a1acfe977892f41c2b83ba6bafa6d92019f7f 100644 (file)
--- 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 4d21557c565b6fca398dc46d3e3ae1a13f8c966b..2810f792e03bebd16e4ef476e931e5c8f7c2c29e 100644 (file)
--- 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 0b3acffa71a43c68154e4e7c2bfd6898c5434809..f0b82c965a9d49b3afccd093fe0290c03cbce374 100644 (file)
--- 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 08f9c1e6c24cbad6ccda66144440dcbd116cae9d..877fd168e434e6d1a475a7bb0e872b48ba129e15 100644 (file)
--- 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 5c8e48f9527089a4e3d80d234a474deabae9492b..19aed2aa4f7f9ad16c30dddf531ab91b8bf13b55 100644 (file)
--- 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 019e4cec231b94dba32674e6de91aabae3fef7d1..aaaa077da0a354b3f6905e7a0d4147956f566c8b 100644 (file)
--- 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 2463e2add77e5a619ee72d639fab352b585839f0..2328d21a0ad7a420df2670066ea59b6654930d77 100644 (file)
--- 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 7d9e014710bf09da26363fa44920f1f7cf039666..d376ecae17043289b48991eff42995582ae596dd 100644 (file)
--- 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 f1d98b94c4677852f0812d2deeae63d8a341a43e..65d63aa658581fcbb27f78cb02a988b6de1b768e 100644 (file)
--- 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 a33b6f3d3c4a9548309bf126e689828f6b8e9f3e..2eb982bc14b6a73e742c7bbabb63d951bac69624 100644 (file)
--- 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 2315c4d545b80ad5f125035f7c1e350bedafed78..39239e6b3efc9ce57eacad38de23a36521ddd286 100644 (file)
--- 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 537f754d7ef4083af3b4c37a73ec796b2551cac6..e078d9993444a767d81004d95b310cadb7e74a2e 100644 (file)
--- 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 392eac4f2e4aa660b2411ae54faefece9a175c20..ec24963953226e69021cdc178e2878baf8069881 100644 (file)
--- 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 1618e30cc93174f05aa2a14fb05ac96251688623..41914b0fd4322e820f3d5d7d76ea55e54102ec58 100644 (file)
--- 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 9dbaf445f191b89c572b5eec4015fb5e92448519..f21d881a5a1e0f6211a339f4cfb9132c7ab4d029 100644 (file)
--- 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 bd803da96f013e67029df9c5c9552bb9edd4ba14..46727de8d3a4ceecfd32759849cc06a3c7404aa2 100644 (file)
--- 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 9e66e432f4cf860cf57d36cf43a7d2daa8f7c2ae..bf93ef63a7e55c740c64e4fce6f190c621761d5a 100644 (file)
--- 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)"