Fix some tests.

regress/copy-mode-redraw.sh

@@ -4,6 +4,8 @@
 # inside an outer tmux pane; the outer pane is captured to inspect what the
 # inner client actually drew.
 
+. ./regress-common.inc
+
 PATH=/bin:/usr/bin
 TERM=screen
 LC_ALL=C.UTF-8
@@ -60,10 +62,9 @@ $TMUX2 set -g mode-keys vi || exit 1
 $TMUX2 set -g copy-mode-line-numbers off || exit 1
 $TMUX2 set -g copy-mode-position-format "#[align=right][23/100-LONGTAIL]" || exit 1
 
-$TMUX -f/dev/null new -d -x48 -y8 || exit 1
+$TMUX -f/dev/null new -d -x48 -y8 "$TMUX2 attach" || exit 1
 $TMUX set -g status off || exit 1
-$TMUX send -l "$TMUX2 attach" || exit 1
-$TMUX send Enter || exit 1
+wait_for_clients 1 $TMUX2 || fail "inner client did not attach"
 sleep 1
 
 CLIENT=$($TMUX2 list-clients -F '#{client_name}' | head -1)
@@ -154,7 +155,7 @@ $TMUX resizew -x80 -y24 || exit 1
 $TMUX2 refresh -t"$CLIENT" -c || exit 1
 $TMUX2 new-window "cat ../tmux.c; exec sleep 100" || exit 1
 sleep 1
-$TMUX2 splitw -hd || exit 1
+$TMUX2 splitw -hd 'exec sleep 100' || exit 1
 sleep 1
 $TMUX capturep -pS0 -E- >$BEFORE || exit 1
 $TMUX2 copy-mode -H -t:.0 || exit 1

regress/image-floating-content-wipe.sh

@@ -4,6 +4,7 @@
 # content in an overlapping floating pane when leaving copy mode.
 
 . ./image-common.inc
+. ./regress-common.inc
 
 PATH=/bin:/usr/bin
 TERM=screen
@@ -29,9 +30,8 @@ image_check_support $TMUX2
 # not reproduce on a fallback or Kitty client.
 $TMUX2 set -as terminal-features ',*:sixel' || exit 1
 
-$TMUX new-session -d -x 60 -y 20 || exit 1
-$TMUX send-keys -l "$TMUX2 attach-session" || exit 1
-$TMUX send-keys Enter || exit 1
+$TMUX new-session -d -x 60 -y 20 "$TMUX2 attach-session" || exit 1
+wait_for_clients 1 $TMUX2 || exit 1
 sleep 1
 
 # Sanity check: the floating pane's content is visible before anything

regress/ncv.sh

@@ -2,6 +2,8 @@
 
 # Check that attributes listed in ncv are not used with colours.
 
+. ./regress-common.inc
+
 PATH=/bin:/usr/bin
 TERM=screen
 LC_ALL=C.UTF-8
@@ -30,10 +32,9 @@ $TMUX2 set -g status-format[0] \
 	'#[fg=black,bg=green,underscore,dim]MARK' || exit 1
 $TMUX2 set -as terminal-overrides ',screen:ncv=18' || exit 1
 
-$TMUX new -d -x20 -y5 || exit 1
+$TMUX new -d -x20 -y5 "$TMUX2 attach" || exit 1
 $TMUX set -g status off || exit 1
-$TMUX send -l "$TMUX2 attach" || exit 1
-$TMUX send Enter || exit 1
+wait_for_clients 1 $TMUX2 || fail "inner client did not attach"
 sleep 1
 
 $TMUX capturep -pe >$TMP || exit 1

regress/screen-redraw-fill-character.sh

@@ -4,6 +4,8 @@
 # client so OUTSIDE spans exist, then the only tiled pane is removed so EMPTY
 # spans exist inside the window around a floating pane.
 
+. ./regress-common.inc
+
 PATH=/bin:/usr/bin
 TERM=screen
 LC_ALL=C.UTF-8
@@ -41,12 +43,11 @@ tiled=$($TMUX2 list-panes -F '#{pane_floating_flag} #{pane_id}' | \
 	awk '$1==0{print $2; exit}') || exit 1
 $TMUX2 kill-pane -t "$tiled" || exit 1
 
-$TMUX new -d -x40 -y12 || exit 1
+$TMUX new -d -x40 -y12 "$TMUX2 attach" || exit 1
 $TMUX set -g status off || exit 1
 $TMUX set -g window-size manual || exit 1
 $TMUX set -g default-terminal "tmux-256color" || exit 1
-$TMUX send -l "$TMUX2 attach" || exit 1
-$TMUX send Enter || exit 1
+wait_for_clients 1 $TMUX2 || fail "inner client did not attach"
 sleep 1
 
 $TMUX capturep -p >$TMP || exit 1

regress/screen-redraw-menus.sh

@@ -83,12 +83,11 @@ setup() {
 	$TMUX2 setw menu-selected-style "fg=colour16,bg=colour220" || exit 1
 	$TMUX2 setw menu-border-style "fg=colour45,bg=colour235" || exit 1
 
-	$TMUX new -d -x"$1" -y"$2" || exit 1
+	$TMUX new -d -x"$1" -y"$2" "$TMUX2 attach" || exit 1
 	$TMUX set -g status off || exit 1
 	$TMUX set -g window-size manual || exit 1
 	$TMUX set -g default-terminal "tmux-256color" || exit 1
-	$TMUX send -l "$TMUX2 attach" || exit 1
-	$TMUX send Enter || exit 1
+	wait_for_clients 1 $TMUX2 || fail "inner client did not attach"
 	sleep 1
 }