diff --git a/coreutils.spec b/coreutils.spec index 6ae78b28bb34374a85d83af96b61dc813533c499..673a193b08361622e897e18af192b310354ba1d7 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,6 +1,6 @@ Name: coreutils Version: 9.0 -Release: 11 +Release: 12 License: GPLv3+ Summary: A set of basic GNU tools commonly used in shell scripts Url: https://www.gnu.org/software/coreutils/ @@ -39,6 +39,7 @@ Patch24: backport-setenv-Don-t-crash-if-malloc-returns-NULL.patch Patch25: backport-who-don-t-crash-if-clock-gyrates.patch Patch26: backport-doc-od-strings-clarify-operation.patch Patch27: backport-wc-port-to-kernels-that-disable-XSAVE-YMM.patch +Patch28: test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch %ifarch sw_64 Patch13: coreutils-9.0-sw.patch @@ -167,6 +168,10 @@ fi %{_mandir}/man*/* %changelog +* Sat Nov 25 2023 jiangchuangang - 9.0-12 +- skip testcase for overlay filesystem because of no inotify_add_watch + add test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch + * Sun Oct 08 2023 fuanan - 9.0-11 - sync patches from community - add backport-who-fix-only-theoretical-overflow.patch diff --git a/test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch b/test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch new file mode 100644 index 0000000000000000000000000000000000000000..942f0f1cc31de7fe23f19a22c28d6b8ea5854907 --- /dev/null +++ b/test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch @@ -0,0 +1,45 @@ +From 8dc094e77603c61a9b86b448c3128cf61ea66d8a Mon Sep 17 00:00:00 2001 +From: jiangchuangang +Date: Sat, 25 Nov 2023 09:11:43 +0800 +Subject: [PATCH] test: skip overlay filesystem because of no inotify_add_watch + +--- + tests/tail-2/inotify-dir-recreate.sh | 5 +++++ + tests/tail-2/inotify-rotate-resources.sh | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/tests/tail-2/inotify-dir-recreate.sh b/tests/tail-2/inotify-dir-recreate.sh +index 469876b..2af2aed 100755 +--- a/tests/tail-2/inotify-dir-recreate.sh ++++ b/tests/tail-2/inotify-dir-recreate.sh +@@ -21,6 +21,11 @@ + . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src + print_ver_ tail + ++filesystem=$(df -T $(pwd) | awk 'NR==2 {print $2}') ++if [ x"$filesystem" == x"overlay" ]; then ++ skip_ 'overlay filesystem skipped, no inotify_add_watch' ++fi ++ + grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null && is_local_dir_ . \ + || skip_ 'inotify is not supported' + +diff --git a/tests/tail-2/inotify-rotate-resources.sh b/tests/tail-2/inotify-rotate-resources.sh +index 6fa65ff..838a9a1 100755 +--- a/tests/tail-2/inotify-rotate-resources.sh ++++ b/tests/tail-2/inotify-rotate-resources.sh +@@ -22,6 +22,11 @@ print_ver_ tail + # Inotify not used on remote file systems + require_local_dir_ + ++filesystem=$(df -T $(pwd) | awk 'NR==2 {print $2}') ++if [ x"$filesystem" == x"overlay" ]; then ++ skip_ 'overlay filesystem skipped, no inotify_add_watch' ++fi ++ + grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null \ + || skip_ 'inotify required' + +-- +2.36.1 +