summaryrefslogtreecommitdiff
path: root/tests/df/no-mtab-status.sh
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2015-04-05 18:21:38 +0100
committerPádraig Brady <P@draigBrady.com>2015-04-13 09:20:55 +0100
commit1b1c40e1d6f8cf30b6c7c9d31bbddbc3d5cc72e6 (patch)
treeb6f887d9e98343fc3e0389de18dc7b4abc30b51e /tests/df/no-mtab-status.sh
parent74bf6670eb54377f3aec98ef24a3b5f45e3ac554 (diff)
downloadcoreutils-1b1c40e1d6f8cf30b6c7c9d31bbddbc3d5cc72e6.tar.xz
df: fix --local hanging with inaccessible remote mounts
* src/df.c (filter_mount_list): With -l, avoid stating remote mounts. * init.cfg: Avoid test hangs with inaccessible remote mounts. * tests/df/no-mtab-status.sh: Skip with inaccessible remote mounts. * tests/df/skip-rootfs.sh: Likewise. * tests/df/total-verify.sh: Likewise. * NEWS: Mention the bug fix. Reported at http://bugzilla.redhat.com/1199679
Diffstat (limited to 'tests/df/no-mtab-status.sh')
-rwxr-xr-xtests/df/no-mtab-status.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/df/no-mtab-status.sh b/tests/df/no-mtab-status.sh
index 0c1bec8ef..49d12558d 100755
--- a/tests/df/no-mtab-status.sh
+++ b/tests/df/no-mtab-status.sh
@@ -21,7 +21,8 @@
print_ver_ df
require_gcc_shared_
-df || skip_ "df fails"
+# Protect against inaccessible remote mounts etc.
+timeout 10 df || skip_ "df fails"
grep '^#define HAVE_MNTENT_H 1' $CONFIG_HEADER > /dev/null \
|| skip_ "no mntent.h available to confirm the interface"