From 2e246bcbff6a84890c0678c17252bf3cdaa096af Mon Sep 17 00:00:00 2001
From: jcg <jiangchuangang@huawei.com>
Date: Fri, 24 Nov 2023 15:57:02 +0800
Subject: [PATCH] coreutils:test skip overlay filesystem because of no
 inotify_add_watch

---
 coreutils.spec                                |  7 ++-
 ...hat-require-selinux-if-selinux-is-di.patch |  2 +-
 ...stem-because-of-no-inotify_add_watch.patch | 45 +++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch

diff --git a/coreutils.spec b/coreutils.spec
index 64cef7f..418e4bf 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,6 +1,6 @@
 Name:       coreutils
 Version:    8.32
-Release:    5
+Release:    6
 License:    GPLv3+
 Summary:    A set of basic GNU tools commonly used in shell scripts
 Url:        https://www.gnu.org/software/coreutils/
@@ -37,6 +37,7 @@ Patch19:   backport-df-fix-duplicated-remote-entries-due-to-bind-mounts.patch
 Patch20:   backport-df-fix-memory-leak.patch
 Patch21:   backport-ls-avoid-triggering-automounts.patch
 Patch22:   backport-stat-only-automount-with-cached-never.patch
+Patch23:   test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch
 
 Conflicts: filesystem < 3
 # To avoid clobbering installs
@@ -155,6 +156,10 @@ fi
 %{_mandir}/man*/*
 
 %changelog
+* Sat Nov 25 2023 jiangchuangang <jiangchuangang@huawei.com> - 8.32-6
+- skip testcase for overlay filesystem because of no inotify_add_watch
+  add test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch 
+
 * Fri Oct 21 2022 jiangchuangang <jiangchuangang@huawei.com> - 8.32-5
 - backport some patches from upstream
 
diff --git a/skip-the-tests-that-require-selinux-if-selinux-is-di.patch b/skip-the-tests-that-require-selinux-if-selinux-is-di.patch
index 3146424..013700c 100644
--- a/skip-the-tests-that-require-selinux-if-selinux-is-di.patch
+++ b/skip-the-tests-that-require-selinux-if-selinux-is-di.patch
@@ -20,7 +20,7 @@ index 739ba33..d536dec 100644
      || skip_ "this system lacks SELinux support"
  
 +  # Judge the selinux is enabled or not
-+  selinuxenabled; [ $? = 1] && skip_ "SELinux is disabled"
++  selinuxenabled; [ $? = 1 ] && skip_ "SELinux is disabled"
 +
    # Independent of whether SELinux is enabled system-wide,
    # the current file system may lack SELinux support.
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 0000000..942f0f1
--- /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 <jiangchuangang@huawei.com>
+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
+
-- 
Gitee