diff options
| -rw-r--r-- | bootstrap.conf | 2 | ||||
| m--------- | gnulib | 0 | ||||
| -rwxr-xr-x | tests/init.sh | 7 |
3 files changed, 5 insertions, 4 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index eca4edb73..7ab5f5895 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -318,7 +318,7 @@ gnulib_modules=" xstrtol-error xstrtold xstrtoumax - year2038-required + year2038-recommended yesno " diff --git a/gnulib b/gnulib -Subproject d52f9c5197805e44c867819c2f1a4e1b4a19574 +Subproject 9f205ff9624b8e10b4331432c59bc732b8c1a7f diff --git a/tests/init.sh b/tests/init.sh index 6c0939286..0494097e9 100755 --- a/tests/init.sh +++ b/tests/init.sh @@ -646,18 +646,19 @@ compare_dev_null_ () for diff_opt_ in -u -U3 -c '' no; do test "$diff_opt_" != no && - diff_out_=`exec 2>/dev/null; diff $diff_opt_ "$0" "$0" < /dev/null` && + diff_out_=`exec 2>/dev/null + LC_ALL=C diff $diff_opt_ "$0" "$0" < /dev/null` && break done if test "$diff_opt_" != no; then if test -z "$diff_out_"; then - compare_ () { diff $diff_opt_ "$@"; } + compare_ () { LC_ALL=C diff $diff_opt_ "$@"; } else compare_ () { # If no differences were found, AIX and HP-UX 'diff' produce output # like "No differences encountered". Hide this output. - diff $diff_opt_ "$@" > diff.out + LC_ALL=C diff $diff_opt_ "$@" > diff.out diff_status_=$? test $diff_status_ -eq 0 || cat diff.out || diff_status_=2 rm -f diff.out || diff_status_=2 |