mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 22:50:49 +00:00
34ae3b7f77
In order to properly run tests, we need to fix the unicode tests and after some search, I have found that Ludo (who is also the <nixpkgs> maintainer of parted) already reported this upstream and also provided a solution: http://lists.gnu.org/archive/html/bug-parted/2014-08/msg00003.html I'm updating parted to 3.2, because the latest blivet implementation relies on it for device geometry calculations. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From Ludo's suggestion at:
|
|
|
|
http://debbugs.gnu.org/cgi/bugreport.cgi?msg=8;bug=18258
|
|
|
|
diff --git a/tests/.t0251-gpt-unicode.sh.swp b/tests/.t0251-gpt-unicode.sh.swp
|
|
deleted file mode 100644
|
|
index b41c337..0000000
|
|
Binary files a/tests/.t0251-gpt-unicode.sh.swp and /dev/null differ
|
|
diff --git a/tests/t0251-gpt-unicode.sh b/tests/t0251-gpt-unicode.sh
|
|
index c845950..fa63a72 100755
|
|
--- a/tests/t0251-gpt-unicode.sh
|
|
+++ b/tests/t0251-gpt-unicode.sh
|
|
@@ -22,7 +22,24 @@ dev=loop-file
|
|
# create zeroed device
|
|
truncate -s 10m $dev || fail=1
|
|
|
|
-export LC_ALL=C.UTF-8
|
|
+found_locale=no
|
|
+for locale in en_US de_DE fr_FR es_ES
|
|
+do
|
|
+ LC_ALL="$locale.UTF-8"
|
|
+ export LC_ALL
|
|
+
|
|
+ # In a UTF-8 locale, the string below prints as 4 characters.
|
|
+ if [ `printf 'foo\341\264\244' | wc -m` -eq 4 ]; then
|
|
+ found_locale=yes
|
|
+ break
|
|
+ fi
|
|
+done
|
|
+
|
|
+if [ "$found_locale" != "yes" ]; then
|
|
+ echo "no valid UTF-8 locale found; skipping" >&2
|
|
+ exit 77
|
|
+fi
|
|
+
|
|
# create gpt label with named partition
|
|
part_name=$(printf 'foo\341\264\244')
|
|
parted -s $dev mklabel gpt mkpart primary ext2 1MiB 2MiB name 1 $part_name > empty 2>&1 || fail=1
|