Fix tests for macOS.

This commit is contained in:
Nicholas Marriott
2026-09-02 08:43:21 +01:00
parent 73db721dab
commit 1dd1717462
2 changed files with 14 additions and 8 deletions

View File

@@ -81,10 +81,16 @@ if grep -Fq "$smcup" "$off"; then
fail "clear-on-attach off used smcup"
fi
# screen has the indn capability (CSI Ps S), which the preserving path uses
# after setting the scrolling region and moving to its last line.
# Some screen terminfo entries have indn (CSI Ps S), while older ones only
# have ind (newline). The preserving path uses indn once or repeats ind once
# for every line in the terminal plus one.
escape=$(printf '\033')
LC_ALL=C grep -Eq "${escape}\\[[0-9]+S" "$off" ||
fail "clear-on-attach off did not scroll the old contents away"
if ! LC_ALL=C grep -Eq "${escape}\\[[0-9]+S" "$off"; then
hex=$(od -An -tx1 -v "$off" | tr -d ' \n')
case "$hex" in
*0a0a0a0a0a0a0a0a0a0a0a0a*) ;;
*) fail "clear-on-attach off did not scroll the old contents away" ;;
esac
fi
exit 0

View File

@@ -53,7 +53,7 @@ $INNER set-option -g status off || exit 1
$INNER set-option -g window-size manual || exit 1
$INNER set-option -g mouse on || exit 1
$INNER set-window-option pane-scrollbars auto-hide || exit 1
$INNER set-window-option pane-scrollbars-timeout 300 || exit 1
$INNER set-window-option pane-scrollbars-timeout 3000 || exit 1
$INNER set-window-option pane-scrollbars-style \
'bg=colour196,fg=colour231,width=1,pad=0' || exit 1
@@ -66,7 +66,7 @@ wait_for_client
# to expire before taking the hidden reference capture.
$INNER copy-mode -H || exit 1
$INNER send-keys -X history-top || exit 1
sleep 0.7
sleep 3.5
capture "$HIDDEN"
# A copy-mode page movement shows the overlay and starts its timer. Capture
@@ -74,7 +74,7 @@ capture "$HIDDEN"
$INNER send-keys -X page-down || exit 1
sleep 0.1
capture "$VISIBLE"
sleep 0.7
sleep 3.5
capture "$AFTER"
cmp -s "$VISIBLE" "$AFTER" && fail "scrollbar did not hide after timeout"
@@ -89,7 +89,7 @@ capture "$VISIBLE"
cmp -s "$HIDDEN" "$VISIBLE" && fail "scrollbar did not appear on hover"
away=$(printf '\033[<35;5;5M')
$OUTER send-keys -l "$away" || exit 1
sleep 0.7
sleep 3.5
capture "$AFTER"
cmp -s "$HIDDEN" "$AFTER" || fail "scrollbar did not hide after hover"