diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-02-23 23:22:58 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-02-23 23:25:17 +0100 |
| commit | f656cafd4c290db7abb1ac1d357696ffdc1793b7 (patch) | |
| tree | e800e999bacd826cbae5daac53e7dc0c288bb4a7 | |
| parent | a15329798c52c57cc16fc24265327d8b1c73ab41 (diff) | |
| download | coreutils-f656cafd4c290db7abb1ac1d357696ffdc1793b7.tar.xz | |
Avoid test failures when root (/) is not readable.
* tests/test-lib.sh (require_readable_root_): New function.
* tests/misc/pwd-long: Skip this test when / is unreadable.
* tests/du/slash: Likewise.
This is required at least for Mandrake/Mandriva in "secure" mode.
Reported by Theodoros V. Kalamatianos in
http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/12800
| -rwxr-xr-x | tests/du/slash | 3 | ||||
| -rwxr-xr-x | tests/misc/pwd-long | 3 | ||||
| -rw-r--r-- | tests/test-lib.sh | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tests/du/slash b/tests/du/slash index dd9175112..7f218c928 100755 --- a/tests/du/slash +++ b/tests/du/slash @@ -1,7 +1,7 @@ #!/bin/sh # `du /' would omit the `/' on the last line. -# Copyright (C) 2003, 2004, 2006-2007 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2006-2008 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 @@ -22,6 +22,7 @@ if test "$VERBOSE" = yes; then fi . $srcdir/../test-lib.sh +require_readable_root_ fail=0 diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long index 6ab218810..d931d3462 100755 --- a/tests/misc/pwd-long +++ b/tests/misc/pwd-long @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that pwd works even when run from a very deep directory. -# Copyright (C) 2006-2007 Free Software Foundation, Inc. +# Copyright (C) 2006-2008 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 @@ -20,6 +20,7 @@ . $srcdir/../require-perl . $srcdir/../test-lib.sh +require_readable_root_ ARGV_0=$0 export ARGV_0 diff --git a/tests/test-lib.sh b/tests/test-lib.sh index a473dfb31..c494e19ff 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -39,6 +39,11 @@ require_ulimit_() && skip_test_ "this shell lacks ulimit support" } +require_readable_root_() +{ + test -r / || skip_test_ "/ is not readable" +} + # Skip the current test if strace is not available or doesn't work. require_strace_() { |