mirror of
https://github.com/tmux/tmux.git
synced 2026-10-12 21:54:23 +00:00
Update some tests and improve Makefile.
This commit is contained in:
Nicholas Marriott
@@ -17,18 +17,23 @@ PATH=/bin:/usr/bin
|
||||
TERM=screen
|
||||
|
||||
[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
|
||||
TMUX="$TEST_TMUX -Ltest -f/dev/null"
|
||||
TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
|
||||
TMP=$(mktemp -d) || exit 1
|
||||
TMUX_TMPDIR="$TMP"
|
||||
export TMUX_TMPDIR
|
||||
TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
|
||||
TMUX2="$TEST_TMUX -Ltest2$$ -f/dev/null"
|
||||
|
||||
cleanup()
|
||||
{
|
||||
$TMUX kill-server 2>/dev/null
|
||||
$TMUX2 kill-server 2>/dev/null
|
||||
rm -rf "$TMP"
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
fail()
|
||||
{
|
||||
echo "$1"
|
||||
cleanup
|
||||
echo "$1" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -46,16 +51,33 @@ wait_for()
|
||||
{
|
||||
i=0
|
||||
while [ "$i" -lt 50 ]; do
|
||||
if capture | grep -q "$1"; then
|
||||
sleep 0.5
|
||||
CAPTURED=$(capture)
|
||||
if echo "$CAPTURED" | grep -q "$1"; then
|
||||
return 0
|
||||
fi
|
||||
sleep 0.5
|
||||
sleep 0.2
|
||||
i=$((i + 1))
|
||||
done
|
||||
fail "timed out waiting for '$1'"
|
||||
}
|
||||
|
||||
# wait_count $marker $n
|
||||
#
|
||||
# Wait (up to ~10s) until exactly $n rendered lines contain $marker. The
|
||||
# matching capture is left in CAPTURED.
|
||||
wait_count()
|
||||
{
|
||||
i=0
|
||||
while [ "$i" -lt 50 ]; do
|
||||
CAPTURED=$(capture)
|
||||
c=$(echo "$CAPTURED" | grep -c "$1")
|
||||
[ "$c" -eq "$2" ] && return 0
|
||||
sleep 0.2
|
||||
i=$((i + 1))
|
||||
done
|
||||
fail "timed out waiting for $2 lines of '$1' (have $c)"
|
||||
}
|
||||
|
||||
# wait_buffers $n
|
||||
#
|
||||
# Wait (up to ~10s) until the test server has exactly $n paste buffers.
|
||||
@@ -86,8 +108,30 @@ wait_clients()
|
||||
return 1
|
||||
}
|
||||
|
||||
$TMUX kill-server 2>/dev/null
|
||||
$TMUX2 kill-server 2>/dev/null
|
||||
# wait_mode $target $state
|
||||
#
|
||||
# Wait (up to ~10s) until a pane enters or leaves mode.
|
||||
wait_mode()
|
||||
{
|
||||
t=$1
|
||||
want=$2
|
||||
|
||||
i=0
|
||||
while [ "$i" -lt 50 ]; do
|
||||
got=$($TMUX display-message -p -t "$t" '#{pane_in_mode}' \
|
||||
2>/dev/null)
|
||||
[ "$got" = "$want" ] && return 0
|
||||
sleep 0.2
|
||||
i=$((i + 1))
|
||||
done
|
||||
fail "pane $t mode state is $got, expected $want"
|
||||
}
|
||||
|
||||
exit_mode()
|
||||
{
|
||||
$TMUX send-keys -t aaa:0 "$@" || fail "send-keys $* failed"
|
||||
wait_mode aaa:0 0
|
||||
}
|
||||
|
||||
$TMUX new-session -d -s aaa -x 80 -y 24 || exit 1
|
||||
|
||||
@@ -100,57 +144,57 @@ $TMUX set-buffer -b bufz "other buffer" || exit 1
|
||||
|
||||
# --- filter by buffer name ---------------------------------------------------
|
||||
$TMUX choose-buffer -t aaa:0 -F 'B1' -f '#{==:#{buffer_name},bufa}' || exit 1
|
||||
wait_for 'B1'
|
||||
out=$(capture)
|
||||
wait_count ': B1' 1
|
||||
out=$CAPTURED
|
||||
echo "$out" | grep -q 'bufa: B1' || fail "bufa missing when it matches"
|
||||
echo "$out" | grep -q 'bufz: B1' && fail "bufz shown but does not match"
|
||||
[ "$(echo "$out" | grep -c ': B1')" -eq 1 ] || fail "expected 1 buffer"
|
||||
$TMUX send-keys -t aaa:0 q
|
||||
exit_mode q
|
||||
|
||||
# --- filter by buffer content ------------------------------------------------
|
||||
$TMUX choose-buffer -t aaa:0 -F 'B2' -f '#{m:*hello*,#{buffer_sample}}' || \
|
||||
exit 1
|
||||
wait_for 'B2'
|
||||
out=$(capture)
|
||||
wait_count ': B2' 1
|
||||
out=$CAPTURED
|
||||
echo "$out" | grep -q 'bufa: B2' || fail "bufa missing when content matches"
|
||||
echo "$out" | grep -q 'bufz: B2' && fail "bufz shown but content not matched"
|
||||
$TMUX send-keys -t aaa:0 q
|
||||
exit_mode q
|
||||
|
||||
# --- no filter shows both buffers ---------------------------------------------
|
||||
$TMUX choose-buffer -t aaa:0 -F 'B3' || exit 1
|
||||
wait_for 'B3'
|
||||
out=$(capture)
|
||||
wait_count ': B3' 2
|
||||
out=$CAPTURED
|
||||
echo "$out" | grep -q 'bufa: B3' || fail "bufa missing with no filter"
|
||||
echo "$out" | grep -q 'bufz: B3' || fail "bufz missing with no filter"
|
||||
[ "$(echo "$out" | grep -c ': B3')" -eq 2 ] || fail "expected 2 buffers"
|
||||
$TMUX send-keys -t aaa:0 q
|
||||
exit_mode q
|
||||
|
||||
# --- filter matching nothing ---------------------------------------------------
|
||||
#
|
||||
# Everything is shown and the filter indicator reports no matches.
|
||||
$TMUX choose-buffer -t aaa:0 -F 'B4' -f '#{==:#{buffer_name},nosuch}' || \
|
||||
exit 1
|
||||
wait_for 'B4'
|
||||
out=$(capture)
|
||||
wait_count ': B4' 2
|
||||
out=$CAPTURED
|
||||
echo "$out" | grep -q 'bufa: B4' || fail "bufa missing with no-match filter"
|
||||
echo "$out" | grep -q 'bufz: B4' || fail "bufz missing with no-match filter"
|
||||
echo "$out" | grep -q 'no matches' || fail "no matches indicator missing"
|
||||
$TMUX send-keys -t aaa:0 q
|
||||
exit_mode q
|
||||
|
||||
# --- sort orders ---------------------------------------------------------------
|
||||
#
|
||||
# By name bufa sorts first and -r reverses.
|
||||
$TMUX choose-buffer -t aaa:0 -F 'B5' -O name || exit 1
|
||||
wait_for 'B5'
|
||||
capture | grep ': B5' | head -1 | grep -q 'bufa: B5' || \
|
||||
wait_count ': B5' 2
|
||||
echo "$CAPTURED" | grep ': B5' | head -1 | grep -q 'bufa: B5' || \
|
||||
fail "bufa not first with -O name"
|
||||
$TMUX send-keys -t aaa:0 q
|
||||
exit_mode q
|
||||
|
||||
$TMUX choose-buffer -t aaa:0 -F 'B6' -O name -r || exit 1
|
||||
wait_for 'B6'
|
||||
capture | grep ': B6' | head -1 | grep -q 'bufz: B6' || \
|
||||
wait_count ': B6' 2
|
||||
echo "$CAPTURED" | grep ': B6' | head -1 | grep -q 'bufz: B6' || \
|
||||
fail "bufz not first with -O name -r"
|
||||
$TMUX send-keys -t aaa:0 q
|
||||
exit_mode q
|
||||
|
||||
# --- d deletes the selected buffer --------------------------------------------
|
||||
#
|
||||
@@ -161,16 +205,16 @@ $TMUX send-keys -t aaa:0 d
|
||||
wait_buffers 1
|
||||
$TMUX list-buffers -F '#{buffer_name}' | grep -q 'bufa' || \
|
||||
fail "wrong buffer deleted"
|
||||
$TMUX send-keys -t aaa:0 q
|
||||
exit_mode q
|
||||
|
||||
# --- C-t tags all buffers and D deletes the tagged ------------------------------
|
||||
$TMUX set-buffer -b bufz "other buffer" || exit 1
|
||||
$TMUX set-buffer -b bufb "third buffer" || exit 1
|
||||
$TMUX choose-buffer -t aaa:0 -F 'G2' || exit 1
|
||||
wait_for ': G2'
|
||||
wait_count ': G2' 3
|
||||
$TMUX send-keys -t aaa:0 C-t D
|
||||
wait_buffers 0
|
||||
$TMUX send-keys -t aaa:0 q
|
||||
exit_mode q
|
||||
|
||||
# --- Enter runs the default command (paste-buffer) ------------------------------
|
||||
#
|
||||
@@ -178,22 +222,14 @@ $TMUX send-keys -t aaa:0 q
|
||||
# into the shell in the pane, where it appears on the screen.
|
||||
$TMUX set-buffer -b bufa "hello buffer" || exit 1
|
||||
$TMUX choose-buffer -t aaa:0 -F 'G3' || exit 1
|
||||
wait_for 'bufa: G3'
|
||||
$TMUX send-keys -t aaa:0 Enter
|
||||
i=0
|
||||
while [ "$i" -lt 50 ]; do
|
||||
[ "$($TMUX display -p -t aaa:0 '#{pane_in_mode}')" = "0" ] && break
|
||||
sleep 0.5
|
||||
i=$((i + 1))
|
||||
done
|
||||
[ "$i" -lt 50 ] || fail "mode did not exit after Enter"
|
||||
wait_count ': G3' 1
|
||||
exit_mode Enter
|
||||
i=0
|
||||
while [ "$i" -lt 50 ]; do
|
||||
$TMUX capture-pane -p -t aaa:0 | grep -q 'hello buffer' && break
|
||||
sleep 0.5
|
||||
sleep 0.2
|
||||
i=$((i + 1))
|
||||
done
|
||||
[ "$i" -lt 50 ] || fail "buffer not pasted into pane"
|
||||
|
||||
cleanup
|
||||
exit 0
|
||||
|
||||
Reference in New Issue
Block a user