From c4110f7f4eac347fdbce71c286659a77beb138f7 Mon Sep 17 00:00:00 2001 From: Jun T Date: Tue, 25 Nov 2014 22:48:53 +0100 Subject: 33769: workaround for KEYTIMEOUT to work from test cases on Darwin and FreeBSD --- ChangeLog | 3 +++ Test/comptest | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08f53b631..834537d64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-11-25 Oliver Kiddle + * Jun T: 33769: Test/comptest: workaround for KEYTIMEOUT to + work from test cases on Darwin and FreeBSD + * 33770: Src/Zle/zle_main.c: avoid calling identical FIONREAD ioctl twice in succession diff --git a/Test/comptest b/Test/comptest index c67237a9a..1f4dac682 100644 --- a/Test/comptest +++ b/Test/comptest @@ -34,7 +34,7 @@ comptestinit () { "fpath=( $fpath )" \ "bindkey -$comptest_keymap" \ 'LISTMAX=10000000 -stty 38400 columns 80 rows 24 werase undef tabs +stty 38400 columns 80 rows 24 tabs -icanon -iexten TERM=vt100 KEYTIMEOUT=1 setopt zle @@ -162,9 +162,9 @@ comptest () { zletest () { local first=0 for input; do + zpty_flush Before zletest # sleep for $KEYTIMEOUT (( first++ )) && read -t 0.011 -k 1 < /dev/null - # zpty_flush Before zletest zpty -n -w zsh "$input" done zpty -n -w zsh $'\C-X' -- cgit 1.4.1