diff --git a/tests/golden/basic-posix-consistency b/tests/golden/basic-posix-consistency index e96251bc..7fd126a1 100644 --- a/tests/golden/basic-posix-consistency +++ b/tests/golden/basic-posix-consistency @@ -47,7 +47,7 @@ four --- dir within dir --- overwrite file --- can't overwrite non-empty dir -mv: cannot move '/mnt/test/test/basic-posix-consistency/dir/c/clobber' to '/mnt/test/test/basic-posix-consistency/dir/a/dir': Directory not empty +mv: cannot overwrite '/mnt/test/test/basic-posix-consistency/dir/a/dir': Directory not empty --- can overwrite empty dir --- can rename into root == path resoluion diff --git a/tests/tests/basic-posix-consistency.sh b/tests/tests/basic-posix-consistency.sh index 6abe4e46..bb9d9e66 100644 --- a/tests/tests/basic-posix-consistency.sh +++ b/tests/tests/basic-posix-consistency.sh @@ -138,7 +138,9 @@ echo "--- can't overwrite non-empty dir" mkdir "$T_D0/dir/a/dir" touch "$T_D0/dir/a/dir/nope" mkdir "$T_D1/dir/c/clobber" -mv -T "$T_D1/dir/c/clobber" "$T_D1/dir/a/dir" 2>&1 | t_filter_fs +mv -T "$T_D1/dir/c/clobber" "$T_D1/dir/a/dir" 2>&1 | \ + sed "s@mv: cannot move '.*' to '\(.*\)': Directory not empty@mv: cannot overwrite '\1': Directory not empty@g" | \ + t_filter_fs find "$T_D0/dir" -ls 2>&1 | t_filter_fs > "$T_TMP.0" find "$T_D1/dir" -ls 2>&1 | t_filter_fs > "$T_TMP.1" diff -u "$T_TMP.0" "$T_TMP.1"