about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrank Terbeck <bewater@users.sourceforge.net>2011-12-30 13:37:41 +0000
committerFrank Terbeck <bewater@users.sourceforge.net>2011-12-30 13:37:41 +0000
commitea7e24879fe3e7bf59b4373708158d5c973282a6 (patch)
tree5155605ce7e6b3ed2bd6cd33bb53b6247fc796be
parentee03cac7fea67062eff3340b018b8d38c35f6a95 (diff)
downloadzsh-ea7e24879fe3e7bf59b4373708158d5c973282a6.tar.gz
zsh-ea7e24879fe3e7bf59b4373708158d5c973282a6.tar.xz
zsh-ea7e24879fe3e7bf59b4373708158d5c973282a6.zip
30048: C02cond.ztst: Avoid [[ -N ... ]] on file-systems mounted `noatime'
-rw-r--r--ChangeLog5
-rw-r--r--Test/C02cond.ztst3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b874230b3..0afa5b3b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-30  Frank Terbeck  <ft@bewatermyfriend.org>
 
+	* 30048: Test/C02cond.ztst: Avoid [[ -N ... ]] on file-systems
+	mounted `noatime', if possible.
+
 	* 30046: Functions/VCS_Info/Backends/VCS_INFO_get_data_svn: Fix
 	support for subversion version 1.7.
 
@@ -15801,5 +15804,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5550 $
+* $Revision: 1.5551 $
 *****************************************************
diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst
index 629fdd206..57427557f 100644
--- a/Test/C02cond.ztst
+++ b/Test/C02cond.ztst
@@ -139,6 +139,9 @@
   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
+    print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with noatime file system)"
+    true
   else
     [[ -N newnewnew && ! -N unmodified ]]
   fi