diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-03-25 09:57:23 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-03-25 09:57:23 -0700 |
| commit | 158484941ac1ff20ce93e4aff46fef6cd22dbf91 (patch) | |
| tree | b2e55fe411ce0d1ee74b1f26d2e7f761669b840b | |
| parent | 13bad92fd85c4e4a3077080606f6ad6217b29bd5 (diff) | |
| download | zsh-158484941ac1ff20ce93e4aff46fef6cd22dbf91.tar.gz zsh-158484941ac1ff20ce93e4aff46fef6cd22dbf91.zip | |
34774: fix %prep and use read from a no-op pipe to force wait for the timeout
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Test/W01history.ztst | 2 | ||||
| -rw-r--r-- | Test/comptest | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2015-03-25 Barton E. Schaefer <schaefer@zsh.org> + + * 34774: Test/W01history.ztst, Test/comptest: fix %prep and use + read from a no-op pipe to force wait for the timeout + 2015-03-23 Barton E. Schaefer <schaefer@zsh.org> * 34772: Test/W01history.ztst, Test/comptest: add new test diff --git a/Test/W01history.ztst b/Test/W01history.ztst index 2492c418f..3a64530c5 100644 --- a/Test/W01history.ztst +++ b/Test/W01history.ztst @@ -2,7 +2,7 @@ %prep - [[ -t 0 ]] && print -u $ZTST_fd History tests write to /dev/tty + if [[ -t 0 ]]; then print -u $ZTST_fd History tests write to /dev/tty; fi %test diff --git a/Test/comptest b/Test/comptest index ef8421755..20a3a5b1d 100644 --- a/Test/comptest +++ b/Test/comptest @@ -164,7 +164,7 @@ zletest () { for input; do # zpty_flush Before zletest # sleep for $KEYTIMEOUT - (( first++ )) && read -t 0.011 -u 0 -k 1 < /dev/null + (( first++ )) && { sleep 2 & } | read -t 0.011 -u 0 -k 1 zpty -n -w zsh "$input" done zpty -n -w zsh $'\C-X' |