Open Build Service

Changes of Revision 18

_service:tar_scm_kernel_repo:coreutils.spec Changed

_service:tar_scm_kernel_repo:test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch Added

@@ -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
+