diff options
| author | Jim Meyering <jim@meyering.net> | 2007-07-31 09:49:05 +0200 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-07-31 12:10:11 +0200 |
| commit | 3b03442c5423562749982e159111782db6812b14 (patch) | |
| tree | edbb99f525d92ef165e4ac16c9bd15c2f5bb72ae | |
| parent | 1b6f200c8e90d89c16805569aa11bf64c45395c1 (diff) | |
| download | coreutils-3b03442c5423562749982e159111782db6812b14.tar.xz | |
Add a test for du not counting size of inaccessible directories.
* tests/du/inacc-dir: New file. Test for fts.c bug fixed yesterday.
* tests/du/Makefile.am (TESTS): Add inacc-dir.
* NEWS: Mention the bug fix.
Signed-off-by: Jim Meyering <jim@meyering.net>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | tests/du/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/du/inacc-dir | 48 |
4 files changed, 59 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2007-07-31 Jim Meyering <jim@meyering.net> + + Add a test for du not counting size of inaccessible directories. + * tests/du/inacc-dir: New file. Test for fts.c bug fixed yesterday. + * tests/du/Makefile.am (TESTS): Add inacc-dir. + * NEWS: Mention the bug fix. + 2007-07-28 Jim Meyering <jim@meyering.net> Attempt to copy a regular file, even if stat says it is empty. @@ -80,6 +80,9 @@ GNU coreutils NEWS -*- outline -*- cut now diagnoses the '-' in "cut -f -" as an invalid range, rather than interpreting it as the unlimited range, "1-". + du -s now includes the size of any stat'able-but-inaccessible directory + in the total size. + ls -x DIR would sometimes output the wrong string in place of the first entry. [introduced in coreutils-6.8] diff --git a/tests/du/Makefile.am b/tests/du/Makefile.am index a15b6462c..71ef3f341 100644 --- a/tests/du/Makefile.am +++ b/tests/du/Makefile.am @@ -16,6 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. TESTS = \ + inacc-dir \ one-file-system \ inacc-dest \ long-from-unreadable \ diff --git a/tests/du/inacc-dir b/tests/du/inacc-dir new file mode 100755 index 000000000..3bfbdefe9 --- /dev/null +++ b/tests/du/inacc-dir @@ -0,0 +1,48 @@ +#!/bin/sh +# Ensure that du counts the size of an inaccessible directory. +# Copyright (C) 2007 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +if test "$VERBOSE" = yes; then + set -x + du --version +fi + +pwd=`pwd` +t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$ +trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0 +trap '(exit $?); exit $?' 1 2 13 15 + +framework_failure=0 +mkdir -p $tmp || framework_failure=1 +cd $tmp || framework_failure=1 +mkdir -p a/sub || framework_failure=1 + +if test $framework_failure = 1; then + echo "$0: failure in testing framework" 1>&2 + (exit 1); exit 1 +fi + +fail=0 + +du -s a > exp || fail=1 +chmod 0 a/sub || fail=1 +# Expect failure, ignore diagnostics. +du -s a > out 2> /dev/null && fail=1 + +cmp out exp || fail=1 +test $fail = 1 && diff out exp 2> /dev/null + +(exit $fail); exit $fail |