diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2016-04-29 13:14:10 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2016-04-29 13:14:10 -0700 |
| commit | 59de766e262fe778b865d17243eb831ed391b9da (patch) | |
| tree | 5a75462ecc155ec8cf8a2847eeb94e6e2e87dc2c | |
| parent | fea013b8e8cc3b2d8e7ca59c1f32b27cdf376155 (diff) | |
| download | zsh-59de766e262fe778b865d17243eb831ed391b9da.tar.gz zsh-59de766e262fe778b865d17243eb831ed391b9da.tar.xz zsh-59de766e262fe778b865d17243eb831ed391b9da.zip | |
38358: "fgrep --" for noatime check in case a mount point is named "-"
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Test/C02cond.ztst | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 29d2c386b..8f98a7cd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-04-29 Barton E. Schaefer <schaefer@zsh.org> + + * 38358: Test/C02cond.ztst: "fgrep --" for noatime check in case + a mount point is named "-" as in Fedora mock environment + 2016-04-29 Peter Stephenson <p.stephenson@samsung.com> * Sebastian: 38356: Src/Modules/curses.c, Doc/Zsh/mod_curses.yo: diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst index 88cad0d64..f9fc185e9 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 { df -k -- ${$({mount || /sbin/mount} | awk '/noatime/ {print $1,$3}'):-""} | tr -s ' ' | fgrep "$(df -k . | tail -1 | tr -s ' ')" } >&/dev/null; 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 ]] |