From 9e19f132f2963d603a881d8e35411348638e5fc0 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 6 Jul 2022 09:54:53 +0100
Subject: [PATCH] Errors are now displayed on attach so use control mode to
 test instead.

---
 regress/if-shell-error.sh            | 13 +++++--------
 regress/kill-session-process-exit.sh |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/regress/if-shell-error.sh b/regress/if-shell-error.sh
index 24dc578e..2896d9aa 100644
--- a/regress/if-shell-error.sh
+++ b/regress/if-shell-error.sh
@@ -11,16 +11,13 @@ TMUX="$TEST_TMUX -Ltest"
 $TMUX kill-server 2>/dev/null
 
 TMP=$(mktemp)
-trap "rm -f $TMP" 0 1 15
+OUT=$(mktemp)
+trap "rm -f $TMP $OUT" 0 1 15
 
 cat <<EOF >$TMP
 if 'true' 'wibble wobble'
 EOF
 
-$TMUX -f$TMP new -d || exit 1
-sleep 1
-E=$($TMUX display -p '#{pane_in_mode}')
-$TMUX kill-server 2>/dev/null
-[ "$E" = "1" ] || exit 1
-
-exit 0
+$TMUX -f$TMP -C new <<EOF >$OUT
+EOF
+grep -q "^%config-error $TMP:1: $TMP:1: unknown command: wibble$" $OUT
diff --git a/regress/kill-session-process-exit.sh b/regress/kill-session-process-exit.sh
index 69ee27a2..82cd7412 100644
--- a/regress/kill-session-process-exit.sh
+++ b/regress/kill-session-process-exit.sh
@@ -8,13 +8,14 @@ TERM=screen
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
 TMUX="$TEST_TMUX -Ltest"
 $TMUX kill-server 2>/dev/null
+sleep 1
 
 $TMUX -f/dev/null new -d 'sleep 1000' || exit 1
 P=$($TMUX display -pt0:0.0 '#{pane_pid}')
 $TMUX -f/dev/null new -d || exit 1
 sleep 1
 $TMUX kill-session -t0:
-sleep 1
+sleep 3
 kill -0 $P 2>/dev/null && exit 1
 $TMUX kill-server 2>/dev/null