Shorten all socket names because macOS is stupid.

2026-07-09 02:49:30 +00:00 · 2026-07-06 11:50:58 +01:00
parent 069201dd1a
commit eb82e8527a
84 changed files with 114 additions and 113 deletions
--- a/regress/alerts.sh
+++ b/regress/alerts.sh
@@ -19,7 +19,7 @@ export TERM LC_ALL LANG
 OUT=$(mktemp -d)
 TMUX_TMPDIR="$OUT"
 export TMUX_TMPDIR
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 fail()
 {
--- a/regress/am-terminal.sh
+++ b/regress/am-terminal.sh
@@ -4,9 +4,9 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 $TMUX2 kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/border-arrows.sh
+++ b/regress/border-arrows.sh
@@ -11,9 +11,9 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
-TMUX_OUTER="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX_OUTER="$TEST_TMUX -LtestB$$ -f/dev/null"
 $TMUX_OUTER kill-server 2>/dev/null

 trap "$TMUX kill-server 2>/dev/null; $TMUX_OUTER kill-server 2>/dev/null" 0 1 15
--- a/regress/buffers.sh
+++ b/regress/buffers.sh
@@ -23,7 +23,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/capture-pane-hyperlink.sh
+++ b/regress/capture-pane-hyperlink.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 TMP=$(mktemp)
 TMP2=$(mktemp)
 trap "rm -f $TMP $TMP2" 0 1 15
--- a/regress/capture-pane-sgr0.sh
+++ b/regress/capture-pane-sgr0.sh
@@ -7,7 +7,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/check-names.sh
+++ b/regress/check-names.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 fail()
--- a/regress/choose-buffer.sh
+++ b/regress/choose-buffer.sh
@@ -20,8 +20,8 @@ TERM=screen
 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"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"

 cleanup()
 {
--- a/regress/choose-client.sh
+++ b/regress/choose-client.sh
@@ -19,8 +19,8 @@ TERM=screen
 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"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"

 cleanup()
 {
--- a/regress/choose-tree.sh
+++ b/regress/choose-tree.sh
@@ -27,8 +27,8 @@ TERM=screen
 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"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"

 cleanup()
 {
--- a/regress/combine-test.sh
+++ b/regress/combine-test.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/command-alias.sh
+++ b/regress/command-alias.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 $TMUX new-session -d -sfoo || exit 1
--- a/regress/command-order.sh
+++ b/regress/command-order.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/conf-syntax.sh
+++ b/regress/conf-syntax.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 for i in conf/*.conf; do
--- a/regress/control-client-sanity.sh
+++ b/regress/control-client-sanity.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/control-client-size.sh
+++ b/regress/control-client-size.sh
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/control-subscriptions.sh
+++ b/regress/control-subscriptions.sh
@@ -7,7 +7,7 @@ LANG=C.UTF-8
 export TERM LC_ALL LANG

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 TMPDIR=$(mktemp -d)
 IN="$TMPDIR/in"
--- a/regress/copy-mode-test-emacs.sh
+++ b/regress/copy-mode-test-emacs.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 $TMUX new -d -x40 -y10 \
--- a/regress/copy-mode-test-vi.sh
+++ b/regress/copy-mode-test-vi.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -f/dev/null -Ltest"
+TMUX="$TEST_TMUX -f/dev/null -LtestA$$"
 $TMUX kill-server 2>/dev/null

 $TMUX new -d -x40 -y10 \
--- a/regress/cursor-test1.sh
+++ b/regress/cursor-test1.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/cursor-test2.sh
+++ b/regress/cursor-test2.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/cursor-test3.sh
+++ b/regress/cursor-test3.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/cursor-test4.sh
+++ b/regress/cursor-test4.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/decrqm-sync.sh
+++ b/regress/decrqm-sync.sh
@@ -9,7 +9,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
 sleep 1

--- a/regress/environ-update.sh
+++ b/regress/environ-update.sh
@@ -17,9 +17,9 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 # A second server on its own socket hosts the pane that runs the inner client.
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"

 cleanup()
 {
--- a/regress/environ.sh
+++ b/regress/environ.sh
@@ -19,7 +19,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 # check_value $args $expected
@@ -151,7 +151,7 @@ cat > "$CONF" <<EOF
 CFGVAR=fromconfig
 %hidden CFGHID=hiddencfg
 EOF
-CTMUX="$TEST_TMUX -Ltest2 -f$CONF"
+CTMUX="$TEST_TMUX -LtestB$$ -f$CONF"
 $CTMUX kill-server 2>/dev/null
 $CTMUX new-session -d -s c -x 80 -y 24 || { rm -f "$CONF"; exit 1; }
 out=$($CTMUX show-environment -g CFGVAR 2>&1)
--- a/regress/floating-pane-geometry.sh
+++ b/regress/floating-pane-geometry.sh
@@ -15,7 +15,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 fail()
--- a/regress/format-fuzzy.sh
+++ b/regress/format-fuzzy.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 # test_format $format $expected_result
 test_format()
--- a/regress/format-modifiers.sh
+++ b/regress/format-modifiers.sh
@@ -17,7 +17,7 @@ LC_ALL=C.UTF-8
 export TZ LANG LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 ESC=$(printf '\033')

--- a/regress/format-mouse.sh
+++ b/regress/format-mouse.sh
@@ -18,8 +18,8 @@ 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"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"

 cleanup()
 {
--- a/regress/format-render-contexts.sh
+++ b/regress/format-render-contexts.sh
@@ -9,8 +9,8 @@ export PATH TERM LANG LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)

-TMUX="$TEST_TMUX -Lformat-render-contexts-$$ -f/dev/null"
-TMUX2="$TEST_TMUX -Lformat-render-contexts-outer-$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 LIMIT=20000

 cleanup()
--- a/regress/format-strings.sh
+++ b/regress/format-strings.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 # test_format $format $expected_result
 test_format()
--- a/regress/format-variables.sh
+++ b/regress/format-variables.sh
@@ -15,10 +15,10 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 # A second server on its own socket provides a real terminal (an inner client
 # attached inside one of its panes) so client terminal variables are populated.
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"

 # Every variable name in format_table[].  Kept as a plain word list so it can be
 # iterated with normal shell word splitting.
--- a/regress/has-session-return.sh
+++ b/regress/has-session-return.sh
@@ -7,7 +7,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 $TMUX -f/dev/null has -tfoo </dev/null 2>/dev/null && exit 1
--- a/regress/hooks-after.sh
+++ b/regress/hooks-after.sh
@@ -10,7 +10,7 @@ export TERM LC_ALL LANG
 OUT=$(mktemp -d)
 TMUX_TMPDIR="$OUT"
 export TMUX_TMPDIR
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 fail()
 {
--- a/regress/hooks-lifecycle.sh
+++ b/regress/hooks-lifecycle.sh
@@ -15,7 +15,7 @@ export TERM LC_ALL LANG
 OUT=$(mktemp -d)
 TMUX_TMPDIR="$OUT"
 export TMUX_TMPDIR
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 fail()
 {
--- a/regress/hooks-notify.sh
+++ b/regress/hooks-notify.sh
@@ -10,7 +10,7 @@ export TERM LC_ALL LANG
 OUT=$(mktemp -d)
 TMUX_TMPDIR="$OUT"
 export TMUX_TMPDIR
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 fail()
 {
--- a/regress/hooks.sh
+++ b/regress/hooks.sh
@@ -10,7 +10,7 @@ export TERM LC_ALL LANG
 OUT=$(mktemp -d)
 TMUX_TMPDIR="$OUT"
 export TMUX_TMPDIR
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 fail()
 {
--- a/regress/if-shell-TERM.sh
+++ b/regress/if-shell-TERM.sh
@@ -7,7 +7,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/if-shell-error.sh
+++ b/regress/if-shell-error.sh
@@ -7,7 +7,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/if-shell-nested.sh
+++ b/regress/if-shell-nested.sh
@@ -7,7 +7,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/input-common.inc
+++ b/regress/input-common.inc
@@ -2,7 +2,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 TMP=$(mktemp)
 EXP=$(mktemp)
--- a/regress/input-keys.sh
+++ b/regress/input-keys.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
 sleep 1
 $TMUX -f/dev/null new -x20 -y2 -d \; set -g escape-time 0 || exit 1
--- a/regress/input-reflow-stress.sh
+++ b/regress/input-reflow-stress.sh
@@ -8,8 +8,8 @@ export PATH TERM LANG LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)

-TMUX="$TEST_TMUX -Linput-reflow-stress-$$ -f/dev/null"
-TMUX2="$TEST_TMUX -Linput-reflow-stress-outer-$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"

 TMP=$(mktemp "${TMPDIR:-/tmp}/input-reflow-stress.XXXXXX") || exit 1
 EXP=$(mktemp "${TMPDIR:-/tmp}/input-reflow-stress.XXXXXX") || exit 1
--- a/regress/input-replies.sh
+++ b/regress/input-replies.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 $TMUX kill-server 2>/dev/null
 sleep 0.5
--- a/regress/input-requests.sh
+++ b/regress/input-requests.sh
@@ -15,7 +15,8 @@ import tempfile
 import time

 tmux = sys.argv[1]
-server = [tmux, "-Ltest", "-f/dev/null"]
+label = "testA%d" % os.getpid()
+server = [tmux, "-L" + label, "-f/dev/null"]

 def run(*args, check=True):
    return subprocess.run(server + list(args), check=check,
@@ -25,7 +26,7 @@ def attach():
    pid, fd = os.forkpty()
    if pid == 0:
        os.environ["TERM"] = "xterm-256color"
-        os.execl(tmux, tmux, "-Ltest", "-f/dev/null", "attach-session",
+        os.execl(tmux, tmux, "-L" + label, "-f/dev/null", "attach-session",
            "-t", "requests")
    os.set_blocking(fd, False)
    return pid, fd
--- a/regress/kill-session-process-exit.sh
+++ b/regress/kill-session-process-exit.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
 sleep 1

--- a/regress/lifecycle-deferred.sh
+++ b/regress/lifecycle-deferred.sh
@@ -8,8 +8,8 @@ export TERM LC_ALL LANG

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)

-TMUX="$TEST_TMUX -Llifecycle-deferred -f/dev/null"
-TMUX2="$TEST_TMUX -Llifecycle-deferred-outer -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"

 TMPDIR=$(mktemp -d)
 IN="$TMPDIR/in"
--- a/regress/mode-mutation.sh
+++ b/regress/mode-mutation.sh
@@ -12,8 +12,8 @@ TMP=$(mktemp -d) || exit 1
 TMUX_TMPDIR="$TMP"
 export TMUX_TMPDIR

-TMUX="$TEST_TMUX -Lmode-mutation-$$ -f/dev/null"
-TMUX2="$TEST_TMUX -Lmode-mutation-outer-$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"

 cleanup_servers()
 {
--- a/regress/new-session-base-index.sh
+++ b/regress/new-session-base-index.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/new-session-command.sh
+++ b/regress/new-session-command.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/new-session-environment.sh
+++ b/regress/new-session-environment.sh
@@ -5,7 +5,7 @@
 PATH=/bin:/usr/bin

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TERM=$($TMUX start \; show -gv default-terminal)
--- a/regress/new-session-no-client.sh
+++ b/regress/new-session-no-client.sh
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/new-session-size.sh
+++ b/regress/new-session-size.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/new-window-command.sh
+++ b/regress/new-window-command.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/options-array.sh
+++ b/regress/options-array.sh
@@ -20,7 +20,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 check_value()
--- a/regress/options-scope.sh
+++ b/regress/options-scope.sh
@@ -17,7 +17,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 # check_value $args $expected
--- a/regress/options-values.sh
+++ b/regress/options-values.sh
@@ -17,7 +17,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 check_value()
--- a/regress/osc-11colours.sh
+++ b/regress/osc-11colours.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 $TMUX new -d
--- a/regress/pane-ops.sh
+++ b/regress/pane-ops.sh
@@ -30,7 +30,7 @@ LC_ALL=C.UTF-8
 export TERM LANG LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 # check_ok $cmd...
--- a/regress/prompt-keys.sh
+++ b/regress/prompt-keys.sh
@@ -7,8 +7,8 @@ LANG=C.UTF-8
 export TERM LC_ALL LANG

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-OUT="$TEST_TMUX -Ltest -f/dev/null"		# outer (host for the client)
-IN="$TEST_TMUX -Ltest2 -f/dev/null"		# inner (under test)
+OUT="$TEST_TMUX -LtestA$$ -f/dev/null"		# outer (host for the client)
+IN="$TEST_TMUX -LtestB$$ -f/dev/null"		# inner (under test)

 $OUT kill-server 2>/dev/null
 $IN kill-server 2>/dev/null
--- a/regress/prompt-mechanics.sh
+++ b/regress/prompt-mechanics.sh
@@ -20,8 +20,8 @@ LANG=C.UTF-8
 export TERM LC_ALL LANG

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-OUT="$TEST_TMUX -Ltest -f/dev/null"		# outer (host for the client)
-IN="$TEST_TMUX -Ltest2 -f/dev/null"		# inner (under test)
+OUT="$TEST_TMUX -LtestA$$ -f/dev/null"		# outer (host for the client)
+IN="$TEST_TMUX -LtestB$$ -f/dev/null"		# inner (under test)

 $OUT kill-server 2>/dev/null
 $IN kill-server 2>/dev/null
--- a/regress/run-shell-output.sh
+++ b/regress/run-shell-output.sh
@@ -7,7 +7,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/screen-redraw-bidi.sh
+++ b/regress/screen-redraw-bidi.sh
@@ -17,8 +17,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 RESULTS=screen-redraw-results

 TMP=$(mktemp)
--- a/regress/screen-redraw-cache.sh
+++ b/regress/screen-redraw-cache.sh
@@ -18,8 +18,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 RESULTS=screen-redraw-results

 TMP=$(mktemp)
--- a/regress/screen-redraw-floating.sh
+++ b/regress/screen-redraw-floating.sh
@@ -16,8 +16,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 RESULTS=screen-redraw-results

 TMP=$(mktemp)
--- a/regress/screen-redraw-indicators.sh
+++ b/regress/screen-redraw-indicators.sh
@@ -18,8 +18,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 RESULTS=screen-redraw-results

 TMP=$(mktemp)
--- a/regress/screen-redraw-outside.sh
+++ b/regress/screen-redraw-outside.sh
@@ -18,8 +18,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 RESULTS=screen-redraw-results

 TMP=$(mktemp)
--- a/regress/screen-redraw-popups.sh
+++ b/regress/screen-redraw-popups.sh
@@ -17,8 +17,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 RESULTS=screen-redraw-results

 TMP=$(mktemp)
--- a/regress/screen-redraw-scrollbars.sh
+++ b/regress/screen-redraw-scrollbars.sh
@@ -16,8 +16,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 RESULTS=screen-redraw-results

 TMP=$(mktemp)
--- a/regress/screen-redraw-status.sh
+++ b/regress/screen-redraw-status.sh
@@ -20,8 +20,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 RESULTS=screen-redraw-results

 TMP=$(mktemp)
--- a/regress/screen-redraw-tiled.sh
+++ b/regress/screen-redraw-tiled.sh
@@ -24,8 +24,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 RESULTS=screen-redraw-results

 TMP=$(mktemp)
--- a/regress/screen-redraw-window-style.sh
+++ b/regress/screen-redraw-window-style.sh
@@ -13,8 +13,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 RESULTS=screen-redraw-results

 TMP=$(mktemp)
--- a/regress/session-group-resize.sh
+++ b/regress/session-group-resize.sh
@@ -10,7 +10,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP1=$(mktemp)
--- a/regress/session-ops.sh
+++ b/regress/session-ops.sh
@@ -27,7 +27,7 @@ LC_ALL=C.UTF-8
 export TERM LANG LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 # check_ok $cmd...
--- a/regress/set-hook-B.sh
+++ b/regress/set-hook-B.sh
@@ -10,7 +10,7 @@ export TERM LC_ALL LANG
 OUT=$(mktemp -d)
 TMUX_TMPDIR="$OUT"
 export TMUX_TMPDIR
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 fail()
 {
--- a/regress/set-hook-R.sh
+++ b/regress/set-hook-R.sh
@@ -10,7 +10,7 @@ export TERM LC_ALL LANG
 OUT=$(mktemp -d)
 TMUX_TMPDIR="$OUT"
 export TMUX_TMPDIR
-TMUX="$TEST_TMUX -Ltest$$ -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"

 fail()
 {
--- a/regress/style-trim.sh
+++ b/regress/style-trim.sh
@@ -17,9 +17,9 @@ if command -v bash >/dev/null 2>&1; then
 fi

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 $TMUX2 kill-server 2>/dev/null

 $TMUX2 -f/dev/null new -d "$TMUX -f/dev/null new -- $shell"
--- a/regress/targets-panes.sh
+++ b/regress/targets-panes.sh
@@ -27,7 +27,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 # check $target $expected [format]
--- a/regress/targets.sh
+++ b/regress/targets.sh
@@ -29,7 +29,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 # check $target $expected [format]
--- a/regress/tty-draw-line.sh
+++ b/regress/tty-draw-line.sh
@@ -10,8 +10,8 @@ LC_ALL=C.UTF-8
 export TERM LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"

 fail() {
 	echo "$*" >&2
--- a/regress/tty-keys.sh
+++ b/regress/tty-keys.sh
@@ -4,9 +4,9 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
-TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 $TMUX2 kill-server 2>/dev/null

 TMP=$(mktemp)
--- a/regress/utf8-test.sh
+++ b/regress/utf8-test.sh
@@ -4,7 +4,7 @@ PATH=/bin:/usr/bin
 TERM=screen

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 TMP=$(mktemp)
 trap "rm -f $TMP" 0 1 15
 $TMUX kill-server 2>/dev/null
--- a/regress/window-ops.sh
+++ b/regress/window-ops.sh
@@ -30,7 +30,7 @@ LC_ALL=C.UTF-8
 export TERM LANG LC_ALL

 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null

 # check_ok $cmd...