CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-19 18:26:32 +02:00
Code Issues Projects Releases Wiki Activity

tests: use system ENOTEMPTY message

Browse Source 
* tests/mv/dir2dir.sh: Map system specific messages.
* tests/rm/d-2.sh: Likewise.
This commit is contained in:
Pádraig Brady
2026-02-17 22:58:29 +00:00
parent dd3fd4593d
commit 5f3a601fbb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/mv/dir2dir.sh
View File

@@ -19,6 +19,7 @@
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ mv
getlimits_
mkdir -p a/t b/t || framework_failure_
touch a/t/f || framework_failure_
@@ -29,12 +30,11 @@ touch a/t/f || framework_failure_
# diagnostic about moving one directory to a subdirectory of itself.
mv b/t a 2> out && fail=1
# Accept any of these: EEXIST, ENOTEMPTY, EBUSY.
sed 's/: File exists/: Directory not empty/'<out>o1;mv o1 out
sed 's/: Device or resource busy/: Directory not empty/'<out>o1;mv o1 out
sed "s/: $EEXIST/: $ENOTEMPTY/"<out>o1;mv o1 out
sed "s/: $EBUSY/: $ENOTEMPTY/"<out>o1;mv o1 out
cat <<\EOF > exp || framework_failure_
mv: cannot overwrite 'a/t': Directory not empty
cat <<EOF > exp || framework_failure_
mv: cannot overwrite 'a/t': $ENOTEMPTY
EOF
compare exp out || fail=1

6
tests/rm/d-2.sh
View File

@@ -19,17 +19,17 @@
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ rm
getlimits_
mkdir d || framework_failure_
> d/a || framework_failure_
rm -d d 2> out && fail=1
# Accept any of these: EEXIST, ENOTEMPTY
sed 's/: File exists/: Directory not empty/' out > out2
sed "s/: $EEXIST/: $ENOTEMPTY/" out > out2
printf "%s\n" \
"rm: cannot remove 'd': Directory not empty" \
"rm: cannot remove 'd': $ENOTEMPTY" \
> exp || framework_failure_
compare exp out2 || fail=1