From 3f942cd03fce1a6cda87018306b50f803f08f350 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Sun, 7 May 2023 17:33:49 +0200 Subject: build: update gnulib submodule to latest This fixes failures in "very-expensive" tests on FTS with many directory entries: FAIL: tests/rm/ext3-perf FAIL: tests/rm/many-dir-entries-vs-OOM The following shows the problem in the former of the above tests: $ mkdir d && seq 400000 | env -C d xargs touch ) $ rm -rf d rm: traversal failed: d: Operation not supported Gnulib commit 3f0950f65abb (2023-04-26) introduced this regression which was fixed again with gnulib commit d4d8abb39eb0. See discussion in * bootstrap.conf (gnulib_modules): Change "year2038-required" to "year2038-recommended"; the module has been replaced. * gnulib: Update to latest. * tests/init.sh: Likewise. --- bootstrap.conf | 2 +- gnulib | 2 +- tests/init.sh | 7 ++++--- 3 files changed, 6 insertions(+), 5 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 index d52f9c519..9f205ff96 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit d52f9c5197805e44c867819c2f1a4e1b4a195740 +Subproject commit 9f205ff9624b8e10b4331432c59bc732b8c1a7fe 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 -- cgit v1.2.1