!113 coreutils: skip testcase inotify-rotate-resources.sh for overlay filesystem in docker
From: @ship_harbour Reviewed-by: @openeuler-basic Signed-off-by: @openeuler-basic
This commit is contained in:
commit
012888c8e0
@ -1,6 +1,6 @@
|
|||||||
Name: coreutils
|
Name: coreutils
|
||||||
Version: 8.32
|
Version: 8.32
|
||||||
Release: 5
|
Release: 6
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Summary: A set of basic GNU tools commonly used in shell scripts
|
Summary: A set of basic GNU tools commonly used in shell scripts
|
||||||
Url: https://www.gnu.org/software/coreutils/
|
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
|
Patch20: backport-df-fix-memory-leak.patch
|
||||||
Patch21: backport-ls-avoid-triggering-automounts.patch
|
Patch21: backport-ls-avoid-triggering-automounts.patch
|
||||||
Patch22: backport-stat-only-automount-with-cached-never.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
|
Conflicts: filesystem < 3
|
||||||
# To avoid clobbering installs
|
# To avoid clobbering installs
|
||||||
@ -155,6 +156,10 @@ fi
|
|||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Oct 21 2022 jiangchuangang <jiangchuangang@huawei.com> - 8.32-5
|
||||||
- backport some patches from upstream
|
- backport some patches from upstream
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@ index 739ba33..d536dec 100644
|
|||||||
|| skip_ "this system lacks SELinux support"
|
|| skip_ "this system lacks SELinux support"
|
||||||
|
|
||||||
+ # Judge the selinux is enabled or not
|
+ # 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,
|
# Independent of whether SELinux is enabled system-wide,
|
||||||
# the current file system may lack SELinux support.
|
# the current file system may lack SELinux support.
|
||||||
|
|||||||
@ -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
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user