From 8ac3fcedcaa61bc70a47aebdc50d503034ff54e5 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Sun, 12 Jul 2026 22:03:16 +0100
Subject: [PATCH] Do not reuse sockets so much to avoid problems with slow
 server shutdown.

---
 regress/command-order.sh        |  6 +++---
 regress/conf-syntax.sh          |  7 +++++--
 regress/control-client-size.sh  |  7 ++++---
 regress/new-session-size.sh     |  6 +++---
 regress/screen-redraw-popups.sh | 21 +++++++++++++++------
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/regress/command-order.sh b/regress/command-order.sh
index 9c957246a..cddd9b29e 100644
--- a/regress/command-order.sh
+++ b/regress/command-order.sh
@@ -4,11 +4,10 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-$TMUX kill-server 2>/dev/null
+TMUX="$TEST_TMUX -LtestA$$-1 -f/dev/null"
 
 TMP=$(mktemp)
-trap "rm -f $TMP" 0 1 15
+trap 'rm -f "$TMP"; $TMUX kill-server 2>/dev/null' 0 1 15
 
 cat <<EOF >$TMP
 new -sfoo -nfoo0; neww -nfoo1; neww -nfoo2
@@ -27,6 +26,7 @@ foo,foo1
 foo,foo2
 EOF
 
+TMUX="$TEST_TMUX -LtestA$$-2 -f/dev/null"
 cat <<EOF >$TMP
 new -sfoo -nfoo0
 neww -nfoo1
diff --git a/regress/conf-syntax.sh b/regress/conf-syntax.sh
index 4dbc384b3..562ac76ad 100644
--- a/regress/conf-syntax.sh
+++ b/regress/conf-syntax.sh
@@ -4,10 +4,13 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-$TMUX kill-server 2>/dev/null
+TMUX=
+n=0
+trap '[ -n "$TMUX" ] && $TMUX kill-server 2>/dev/null' 0 1 15
 
 for i in conf/*.conf; do
+	n=$((n + 1))
+	TMUX="$TEST_TMUX -LtestA$$-$n -f/dev/null"
 	$TMUX -f/dev/null start \; source -n $i || exit 1
 done
 
diff --git a/regress/control-client-size.sh b/regress/control-client-size.sh
index e6742608a..3099b873f 100644
--- a/regress/control-client-size.sh
+++ b/regress/control-client-size.sh
@@ -8,12 +8,11 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-$TMUX kill-server 2>/dev/null
+TMUX="$TEST_TMUX -LtestA$$-1 -f/dev/null"
 
 TMP=$(mktemp)
 OUT=$(mktemp)
-trap "rm -f $TMP $OUT" 0 1 15
+trap 'rm -f "$TMP" "$OUT"; $TMUX kill-server 2>/dev/null' 0 1 15
 
 $TMUX -f/dev/null new -d || exit 1
 sleep 1
@@ -26,6 +25,7 @@ $TMUX ls -F':#{window_width} #{window_height}' >>$OUT
 printf ":80 24\n:100 50\n"|cmp -s $OUT - || exit 1
 $TMUX kill-server 2>/dev/null
 
+TMUX="$TEST_TMUX -LtestA$$-2 -f/dev/null"
 $TMUX -f/dev/null new -d || exit 1
 sleep 1
 cat <<EOF|$TMUX -f/dev/null -C a >$TMP
@@ -37,6 +37,7 @@ $TMUX ls -F':#{window_width} #{window_height}' >>$OUT
 printf ":80 24\n:80 24\n"|cmp -s $OUT - || exit 1
 $TMUX kill-server 2>/dev/null
 
+TMUX="$TEST_TMUX -LtestA$$-3 -f/dev/null"
 cat <<EOF|$TMUX -f/dev/null -C new -x 100 -y 50 >$TMP
 ls -F':#{window_width} #{window_height}'
 refresh -C 80,24
diff --git a/regress/new-session-size.sh b/regress/new-session-size.sh
index 6a35abbbd..422ac69fb 100644
--- a/regress/new-session-size.sh
+++ b/regress/new-session-size.sh
@@ -6,11 +6,10 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-$TMUX kill-server 2>/dev/null
+TMUX="$TEST_TMUX -LtestA$$-1 -f/dev/null"
 
 TMP=$(mktemp)
-trap "rm -f $TMP" 0 1 15
+trap 'rm -f "$TMP"; $TMUX kill-server 2>/dev/null' 0 1 15
 
 $TMUX -f/dev/null new -d </dev/null || exit 1
 sleep 1
@@ -18,6 +17,7 @@ $TMUX ls -F "#{window_width} #{window_height}" >$TMP
 printf "80 24\n"|cmp -s $TMP - || exit 1
 $TMUX kill-server 2>/dev/null
 
+TMUX="$TEST_TMUX -LtestA$$-2 -f/dev/null"
 $TMUX -f/dev/null new -d -x 100 -y 50 </dev/null || exit 1
 sleep 1
 $TMUX ls -F "#{window_width} #{window_height}" >$TMP
diff --git a/regress/screen-redraw-popups.sh b/regress/screen-redraw-popups.sh
index 8ad3ba2eb..26e0f7175 100644
--- a/regress/screen-redraw-popups.sh
+++ b/regress/screen-redraw-popups.sh
@@ -17,13 +17,19 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
-TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
+TMUX=
+TMUX2=
+SETUP=0
 RESULTS=screen-redraw-results
 
 TMP=$(mktemp)
-trap "rm -f $TMP; $TMUX kill-server 2>/dev/null; $TMUX2 kill-server 2>/dev/null" \
-	0 1 15
+
+cleanup() {
+	rm -f "$TMP"
+	[ -n "$TMUX" ] && $TMUX kill-server 2>/dev/null
+	[ -n "$TMUX2" ] && $TMUX2 kill-server 2>/dev/null
+}
+trap cleanup 0 1 15
 
 fail() {
 	echo "$*" >&2
@@ -46,8 +52,11 @@ C="sh -c 'i=0; while [ \$i -lt 13 ]; do printf \"POP%02d abcdefghij\n\" \$i; i=\
 
 # setup: fresh inner window attached inside a fresh outer pane, 40x14.
 setup() {
-	$TMUX kill-server 2>/dev/null
-	$TMUX2 kill-server 2>/dev/null
+	[ -n "$TMUX" ] && $TMUX kill-server 2>/dev/null
+	[ -n "$TMUX2" ] && $TMUX2 kill-server 2>/dev/null
+	SETUP=$((SETUP + 1))
+	TMUX="$TEST_TMUX -LtestA$$-$SETUP -f/dev/null"
+	TMUX2="$TEST_TMUX -LtestB$$-$SETUP -f/dev/null"
 	$TMUX2 new -d -x40 -y14 "$C" || exit 1
 	$TMUX2 set -g status off || exit 1
 	$TMUX2 set -g window-size manual || exit 1