From 4f5d7b7b378e6fe93de19a600717deaab7a76116 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@zsh.org>
Date: Thu, 31 Dec 2015 12:53:13 +0100
Subject: 37453 (with Bart, started by Baptiste Daroussin, 37315): try to
 improve detection of noatime filesystem

---
 Test/C02cond.ztst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Test')

diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst
index 9e1369689..0b4608a21 100644
--- a/Test/C02cond.ztst
+++ b/Test/C02cond.ztst
@@ -154,7 +154,7 @@
     ZTST_skip="[[ -N file ]] not supported on Cygwin"
   elif (( isnfs )); then
     ZTST_skip="[[ -N file ]] not supported with NFS"
-  elif test -f /etc/mtab && { grep $(df . 2>/dev/null| tail -n1 | awk '{print $1}') /etc/mtab | grep -q noatime; }; then
+  elif { df -k -- ${$({mount || /sbin/mount} | awk '/noatime/ {print $1,$3}'):-""} | tr -s ' ' | fgrep "$(df -k . | tail -1 | tr -s ' ')" } >&/dev/null; then
     ZTST_skip="[[ -N file ]] not supported with noatime file system"
   else
     [[ -N $newnewnew && ! -N $unmodified ]]
-- 
cgit 1.4.1