diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2012-02-26 18:54:52 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2012-02-26 18:54:52 +0000 |
| commit | 10082faced3fc848e34510e3b0a0bc5099df9cd5 (patch) | |
| tree | 4cf0f7fa0c34c475fcf9dffdda98bd2927d91a46 | |
| parent | 3425cf5124a4b23aac5f3dd13b337f020591db58 (diff) | |
| download | zsh-10082faced3fc848e34510e3b0a0bc5099df9cd5.tar.gz zsh-10082faced3fc848e34510e3b0a0bc5099df9cd5.tar.xz zsh-10082faced3fc848e34510e3b0a0bc5099df9cd5.zip | |
30270: don't need errors when testing to see if mtime test will work
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | 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 <p.w.stephenson@ntlworld.com> + * 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 |