diff options
| -rwxr-xr-x | test/run | 4 | ||||
| -rw-r--r-- | test/tools/git/blame-in-diff/script | 2 | ||||
| -rw-r--r-- | test/tools/git/blame-jump-message/script | 7 |
3 files changed, 4 insertions, 9 deletions
@@ -198,11 +198,11 @@ ui_out() { [ "$event" = "$expected" ] && break done ;; - -until-grep) + -until-eval | -until-grep) pattern=$1 shift while read -r event <&4; do - if printf %s "$event" | grep "$pattern"; then + if printf %s "$event" | "${arg#-until-}" "$pattern" >/dev/null; then if [ $# -ne 0 ]; then assert_eq "$1" "$event" shift diff --git a/test/tools/git/blame-in-diff/script b/test/tools/git/blame-in-diff/script index e22b3ec8..0cee0ca7 100644 --- a/test/tools/git/blame-in-diff/script +++ b/test/tools/git/blame-in-diff/script @@ -3,7 +3,7 @@ ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }' # We've jumped to the new version of line 2. Move to the old version so we # can annotate the old file. ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "k:git blame<ret>" ] }' -while ui_out -until-grep '"draw_status"' | grep '\[fifo\]'; do :; done > /dev/null +ui_out -until-eval 'grep "draw_status" | grep -v "\[fifo\]"' # We should have jumped to the old version of line 2, assert on kak_selection. ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "x" ] }' diff --git a/test/tools/git/blame-jump-message/script b/test/tools/git/blame-jump-message/script index 9f6fb6e0..92b1f670 100644 --- a/test/tools/git/blame-jump-message/script +++ b/test/tools/git/blame-jump-message/script @@ -1,8 +1,3 @@ -while true; do - ui_out -until-grep draw_status | grep -v '\[fifo\]' >/dev/null && break -done -actual_draw_status=$(ui_out -until-grep draw_status) - expected_subject=$(cat <<'EOF' 2017-07-14 A U Thor "Don't break on single quotes or unbalanced {" EOF @@ -10,5 +5,5 @@ EOF expected_subject_json=\"$(printf '%s' "$expected_subject" | sed 's/"/\\"/g')\" expected_draw_status='{ "jsonrpc": "2.0", "method": "draw_status", "params": [[{ "face": { "fg": "black", "bg": "yellow", "underline": "default", "attributes": [] }, "contents": '"$expected_subject_json"' }], [{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "*git* 13:2 " }, { "face": { "fg": "black", "bg": "yellow", "underline": "default", "attributes": [] }, "contents": "[scratch]" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "underline": "default", "attributes": [] }] }' -assert_eq "$expected_draw_status" "$actual_draw_status" +ui_out -until-grep 'draw_status.*single quotes' "$expected_draw_status" ui_out -ignore 2 |