Merge branch 'master' of git://git.savannah.gnu.org/grub

tests/partmap_test.in

@@ -92,6 +92,12 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
 	disk=hd0
 	;;
 esac
+
+if ! which parted >/dev/null 2>&1; then
+   echo "parted not installed; cannot test partmap"
+   exit 77
+fi
+
 imgfile="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
 outfile="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1
 

tests/util/grub-fs-tester.in

@@ -10,7 +10,7 @@ tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
 
 # This wrapper is to ease insertion of valgrind or time statistics
 run_it () {
-    "$GRUBFSTEST" "$@"
+    LC_ALL=C "$GRUBFSTEST" "$@"
 }
 
 run_grubfstest () {