summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rwxr-xr-xtests/rm/fail-eacces3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ecc090da2..a0854d789 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-02-18 Jim Meyering <jim@meyering.net>
+ * tests/rm/fail-eacces: Skip this test when running as root.
+ Reported by Matthew Woehlke.
+
* bootstrap: Use "._bootmp" as the temporary directory name,
not ".#bootmp". The latter's "#" caused trouble with the new,
gnulib-added "LINK_WARNING_H = $(top_srcdir)/.#bootmp/..." line.
diff --git a/tests/rm/fail-eacces b/tests/rm/fail-eacces
index 29bc91154..b32284864 100755
--- a/tests/rm/fail-eacces
+++ b/tests/rm/fail-eacces
@@ -1,7 +1,7 @@
#!/bin/sh
# Ensure that rm -rf unremovable-non-dir gives a diagnostic.
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-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
@@ -24,6 +24,7 @@ if test "$VERBOSE" = yes; then
fi
. $srcdir/../lang-default
+PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
pwd=`pwd`
t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$