From 10082faced3fc848e34510e3b0a0bc5099df9cd5 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Sun, 26 Feb 2012 18:54:52 +0000 Subject: 30270: don't need errors when testing to see if mtime test will work --- ChangeLog | 6 +++++- Test/C02cond.ztst | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2451574cc..6673aeba0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-02-26 Peter Stephenson + * Alexey I. Froloff: 30270: Test/C02Cond.ztst: we don't care + about errors from df when testing whether the file system has + noatime. + * unposted: Config/version.mk: Update version to 4.3.17-dev-0 to avoid clash with release, also fix incorrect year noticed by Darryl Zurn. @@ -16016,5 +16020,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5595 $ +* $Revision: 1.5596 $ ***************************************************** diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst index 57427557f..494261ee3 100644 --- a/Test/C02cond.ztst +++ b/Test/C02cond.ztst @@ -139,7 +139,7 @@ elif [[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]]; then print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)" true - elif test -f /etc/mtab && { grep $(df . | tail -n1 | awk '{print $1}') /etc/mtab | grep -q noatime; }; then + elif test -f /etc/mtab && { grep $(df . 2>/dev/null| tail -n1 | awk '{print $1}') /etc/mtab | grep -q noatime; }; then print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with noatime file system)" true else -- cgit 1.4.1