From: Jim Meyering <jim@meyering.net>
Date: Tue, 31 Jul 2007 07:49:05 +0000 (+0200)
Subject: Add a test for du not counting size of inaccessible directories.
X-Git-Tag: v6.9.89~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b03442c5423562749982e159111782db6812b14;p=thirdparty%2Fcoreutils.git

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>
---

diff --git a/ChangeLog b/ChangeLog
index 23136e8d07..416864316c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/NEWS b/NEWS
index 059980c02e..5c06c25cf7 100644
--- a/NEWS
+++ b/NEWS
@@ -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 a15b6462c4..71ef3f341f 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 0000000000..3bfbdefe9f
--- /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