diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Test/C02cond.ztst | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 0238e0664..3be09c62a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2016-05-09 Barton E. Schaefer <schaefer@zsh.org> + * Jun T.: 38445 (+tweak): Test/C02cond.ztst: subsequent tests rely + on a file touched by the -N test, so it must always be touched even + when the filesystem is noatime + +2016-05-09 Barton E. Schaefer <schaefer@zsh.org> + * unposted: Functions/Zle/bracketed-paste-magic: update documentary comments to remove references to self-insert-unmeta. diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst index b0e84ddeb..e315f6c10 100644 --- a/Test/C02cond.ztst +++ b/Test/C02cond.ztst @@ -152,23 +152,24 @@ unmodified_ls="$(ls -lu $unmodified)" print -u $ZTST_fd 'This test takes up to 60 seconds...' fi + sleep 2 + touch $newnewnew if [[ $OSTYPE == "cygwin" ]]; then ZTST_skip="[[ -N file ]] not supported on Cygwin" elif (( isnfs )); then ZTST_skip="[[ -N file ]] not supported with NFS" elif { (( ! $+unmodified_ls )) && - { sleep 2; cat $unmodified } && + cat $unmodified && { df -k -- ${$(print -r -- "$mtab" | awk '/noatime/ {print $1,$3}'):-""} | tr -s ' ' | fgrep -- "$(df -k . | tail -1 | tr -s ' ')" } >&/dev/null } || { (( $+unmodified_ls )) && SECONDS=0 && - ! until (( SECONDS >= 60 )); do + ! until (( SECONDS >= 58 )); do ZTST_hashmark; sleep 2; cat $unmodified [[ $unmodified_ls != "$(ls -lu $unmodified)" ]] && break done }; then ZTST_skip="[[ -N file ]] not supported with noatime file system" else - touch $newnewnew [[ -N $newnewnew && ! -N $unmodified ]] fi 0:-N cond |