packages/coreutils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coreutils: skip testcase inotify-rotate-resources.sh for overlay filesystem in docker

Browse Source
This commit is contained in:
jcg 2024-01-27 18:14:45 +08:00
parent c9ac216efe
commit e32a2d3e52
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coreutils.spec
View File

@ -1,6 +1,6 @@
Name: coreutils
Version: 9.4
Release: 1
Release: 2
License: GPLv3+
Summary: A set of basic GNU tools commonly used in shell scripts
Url: https://www.gnu.org/software/coreutils/
@ -22,6 +22,7 @@ Patch7: backport-config-color-alias-for-ls.patch
Patch8: backport-coreutils-df-direct.patch
Patch9: backport-coreutils-i18n.patch
patch10: backport-CVE-2024-0684-split-do-not-shrink-hold-buffer.patch
patch11: test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch
%ifarch sw_64
Patch9001: coreutils-9.0-sw.patch
@ -154,6 +155,10 @@ fi
%{_mandir}/man*/*
%changelog
* Fri Feb 2 2024 jiangchuangang <jiangchuangang@huawei.com> - 9.4-2
- skip testcase for overlay filesystem because of no inotify_add_watch
add test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch
* Thu Feb 1 2024 lvgenggeng <lvgenggeng@uniontech.com> - 9.4-1
- bump to 9.4

44
test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch Normal file
View File

@ -0,0 +1,44 @@
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/inotify-dir-recreate.sh | 5 +++++
tests/tail/inotify-rotate-resources.sh | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/tests/tail/inotify-dir-recreate.sh b/tests/tail/inotify-dir-recreate.sh
index 469876b..2af2aed 100755
--- a/tests/tail/inotify-dir-recreate.sh
+++ b/tests/tail/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/inotify-rotate-resources.sh b/tests/tail/inotify-rotate-resources.sh
index 6fa65ff..838a9a1 100755
--- a/tests/tail/inotify-rotate-resources.sh
+++ b/tests/tail/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