Skip to content

Commit 767ac46

Browse files
author
oech3
committed
Backport cp-mv-enotsup-xattr.sh and writable-under-readonly.sh from GNU coreutils > 9.9
1 parent ee39b35 commit 767ac46

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

util/build-gnu.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW
66
# spell-checker:ignore baddecode submodules xstrtol distros ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed multihardlink texinfo CARGOFLAGS
77
# spell-checker:ignore openat TOCTOU CFLAGS
8-
# spell-checker:ignore hfsplus casefold chattr
98

109
set -e
1110

@@ -169,8 +168,11 @@ grep -rl 'path_prepend_' tests/* | xargs -r "${SED}" -i 's| path_prepend_ ./src|
169168
# path_prepend_ sets $abs_path_dir_: set it manually instead.
170169
grep -rl '\$abs_path_dir_' tests/*/*.sh | xargs -r "${SED}" -i "s|\$abs_path_dir_|${UU_BUILD_DIR//\//\\/}|g"
171170

172-
# Remove hfs dependency (should be merged to upstream)
173-
"${SED}" -i -e "s|hfsplus|ext4 -O casefold|" -e "s|cd mnt|rm -d mnt/lost+found;chattr +F mnt;cd mnt|" tests/mv/hardlink-case.sh
171+
# Backport tests fixed at GNU coreutils > 9.9
172+
curl https://raw.githubusercontent.com/coreutils/coreutils/refs/heads/master/tests/mv/hardlink-case.sh > tests/mv/hardlink-case.sh
173+
# spell-checker:ignore enotsup
174+
curl https://raw.githubusercontent.com/coreutils/coreutils/refs/heads/master/tests/cp/cp-mv-enotsup-xattr.sh > tests/cp/cp-mv-enotsup-xattr.sh
175+
curl https://raw.githubusercontent.com/coreutils/coreutils/refs/heads/master/tests/mkdir/writable-under-readonly.sh > tests/mkdir/writable-under-readonly.sh
174176

175177
# Use the system coreutils where the test fails due to error in a util that is not the one being tested
176178
"${SED}" -i "s|grep '^#define HAVE_CAP 1' \$CONFIG_HEADER > /dev/null|true|" tests/ls/capability.sh

util/why-skip.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
= LD_PRELOAD was ineffective? =
1414
* tests/cp/nfs-removal-race.sh
1515

16-
= temporarily disabled =
17-
* tests/mkdir/writable-under-readonly.sh
18-
1916
= this system lacks SMACK support =
2017
* tests/mkdir/smack-root.sh
2118
* tests/mkdir/smack-no-root.sh
@@ -54,9 +51,6 @@
5451
= no rootfs in mtab =
5552
* tests/df/skip-rootfs.sh
5653

57-
= insufficient mount/ext2 support =
58-
* tests/cp/cp-mv-enotsup-xattr.sh
59-
6054
= requires controlling input terminal =
6155
* tests/misc/stty-pairs.sh
6256
* tests/misc/stty.sh

0 commit comments

Comments
 (0)