diff --git a/util/gnu-patches/series b/util/gnu-patches/series index f303e89c4..c4a9cc080 100644 --- a/util/gnu-patches/series +++ b/util/gnu-patches/series @@ -8,3 +8,4 @@ tests_invalid_opt.patch tests_ls_no_cap.patch tests_sort_merge.pl.patch tests_tsort.patch +tests_du_move_dir_while_traversing.patch diff --git a/util/gnu-patches/tests_du_move_dir_while_traversing.patch b/util/gnu-patches/tests_du_move_dir_while_traversing.patch new file mode 100644 index 000000000..12b7e5c36 --- /dev/null +++ b/util/gnu-patches/tests_du_move_dir_while_traversing.patch @@ -0,0 +1,16 @@ +Index: gnu/tests/du/move-dir-while-traversing.sh +=================================================================== +--- gnu.orig/tests/du/move-dir-while-traversing.sh ++++ gnu/tests/du/move-dir-while-traversing.sh +@@ -91,9 +91,7 @@ retry_delay_ nonempty .1 5 || fail=1 + # Before coreutils-8.10, du would abort. + returns_ 1 du -a $t d2 2> err || fail=1 + +-# check for the new diagnostic +-printf "du: fts_read failed: $t/3/a/b: No such file or directory\n" > exp \ +- || fail=1 +-compare exp err || fail=1 ++# check that it doesn't crash ++grep -Pq "^du: cannot read directory '$t/3/a/b.*': No such file or directory" err || fail=1 + + Exit $fail diff --git a/util/gnu-patches/tests_env_env-S.pl.patch b/util/gnu-patches/tests_env_env-S.pl.patch index 4a1ae939a..1ea860fa0 100644 --- a/util/gnu-patches/tests_env_env-S.pl.patch +++ b/util/gnu-patches/tests_env_env-S.pl.patch @@ -2,7 +2,7 @@ Index: gnu/tests/env/env-S.pl =================================================================== --- gnu.orig/tests/env/env-S.pl +++ gnu/tests/env/env-S.pl -@@ -209,27 +209,28 @@ my @Tests = +@@ -212,27 +212,28 @@ my @Tests = {ERR=>"$prog: no terminating quote in -S string\n"}], ['err5', q[-S'A=B\\q'], {EXIT=>125}, {ERR=>"$prog: invalid sequence '\\q' in -S\n"}],