Permalink
Browse files

30270: don't need errors when testing to see if mtime test will work

  • Loading branch information...
1 parent 3425cf5 commit 10082faced3fc848e34510e3b0a0bc5099df9cd5 Peter Stephenson committed Feb 26, 2012
Showing with 6 additions and 2 deletions.
  1. +5 −1 ChangeLog
  2. +1 −1 Test/C02cond.ztst
View
@@ -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 $
*****************************************************
View
@@ -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

0 comments on commit 10082fa

Please sign in to comment.