circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-09 11:44:23 +00:00
Code Issues Projects Releases Wiki Activity

Do not reuse sockets so much to avoid problems with slow server shutdown.

Browse Source
This commit is contained in:
Nicholas Marriott
2026-07-12 22:03:16 +01:00
parent ea236c12a6
commit 8ac3fcedca
5 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
regress/command-order.sh
View File

@@ -4,11 +4,10 @@ PATH=/bin:/usr/bin
TERM=screen TERM=screen
[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux) [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
TMUX="$TEST_TMUX -LtestA$$ -f/dev/null" TMUX="$TEST_TMUX -LtestA$$-1 -f/dev/null"
$TMUX kill-server 2>/dev/null
TMP=$(mktemp) 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 cat <<EOF >$TMP
new -sfoo -nfoo0; neww -nfoo1; neww -nfoo2 new -sfoo -nfoo0; neww -nfoo1; neww -nfoo2
@@ -27,6 +26,7 @@ foo,foo1
foo,foo2 foo,foo2
EOF EOF
TMUX="$TEST_TMUX -LtestA$$-2 -f/dev/null"
cat <<EOF >$TMP cat <<EOF >$TMP
new -sfoo -nfoo0 new -sfoo -nfoo0
neww -nfoo1 neww -nfoo1

7
regress/conf-syntax.sh
View File

@@ -4,10 +4,13 @@ PATH=/bin:/usr/bin
TERM=screen TERM=screen
[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux) [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
TMUX="$TEST_TMUX -LtestA$$ -f/dev/null" TMUX=
$TMUX kill-server 2>/dev/null n=0
trap '[ -n "$TMUX" ] && $TMUX kill-server 2>/dev/null' 0 1 15
for i in conf/*.conf; do 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 $TMUX -f/dev/null start \; source -n $i || exit 1
done done

7
regress/control-client-size.sh
View File

@@ -8,12 +8,11 @@ PATH=/bin:/usr/bin
TERM=screen TERM=screen
[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux) [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
TMUX="$TEST_TMUX -LtestA$$ -f/dev/null" TMUX="$TEST_TMUX -LtestA$$-1 -f/dev/null"
$TMUX kill-server 2>/dev/null
TMP=$(mktemp) TMP=$(mktemp)
OUT=$(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 $TMUX -f/dev/null new -d || exit 1
sleep 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 printf ":80 24\n:100 50\n"|cmp -s $OUT - || exit 1
$TMUX kill-server 2>/dev/null $TMUX kill-server 2>/dev/null
TMUX="$TEST_TMUX -LtestA$$-2 -f/dev/null"
$TMUX -f/dev/null new -d || exit 1 $TMUX -f/dev/null new -d || exit 1
sleep 1 sleep 1
cat <<EOF|$TMUX -f/dev/null -C a >$TMP 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 printf ":80 24\n:80 24\n"|cmp -s $OUT - || exit 1
$TMUX kill-server 2>/dev/null $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 cat <<EOF|$TMUX -f/dev/null -C new -x 100 -y 50 >$TMP
ls -F':#{window_width} #{window_height}' ls -F':#{window_width} #{window_height}'
refresh -C 80,24 refresh -C 80,24

6
regress/new-session-size.sh
View File

@@ -6,11 +6,10 @@ PATH=/bin:/usr/bin
TERM=screen TERM=screen
[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux) [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
TMUX="$TEST_TMUX -LtestA$$ -f/dev/null" TMUX="$TEST_TMUX -LtestA$$-1 -f/dev/null"
$TMUX kill-server 2>/dev/null
TMP=$(mktemp) 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 $TMUX -f/dev/null new -d </dev/null || exit 1
sleep 1 sleep 1
@@ -18,6 +17,7 @@ $TMUX ls -F "#{window_width} #{window_height}" >$TMP
printf "80 24\n"|cmp -s $TMP - || exit 1 printf "80 24\n"|cmp -s $TMP - || exit 1
$TMUX kill-server 2>/dev/null $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 $TMUX -f/dev/null new -d -x 100 -y 50 </dev/null || exit 1
sleep 1 sleep 1
$TMUX ls -F "#{window_width} #{window_height}" >$TMP $TMUX ls -F "#{window_width} #{window_height}" >$TMP

21
regress/screen-redraw-popups.sh
View File

@@ -17,13 +17,19 @@ LC_ALL=C.UTF-8
export TERM LC_ALL export TERM LC_ALL
[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux) [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
TMUX="$TEST_TMUX -LtestA$$ -f/dev/null" TMUX=
TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null" TMUX2=
SETUP=0
RESULTS=screen-redraw-results RESULTS=screen-redraw-results
TMP=$(mktemp) 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() { fail() {
echo "$*" >&2 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: fresh inner window attached inside a fresh outer pane, 40x14.
setup() { setup() {
$TMUX kill-server 2>/dev/null [ -n "$TMUX" ] && $TMUX kill-server 2>/dev/null
$TMUX2 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 new -d -x40 -y14 "$C" || exit 1
$TMUX2 set -g status off || exit 1 $TMUX2 set -g status off || exit 1
$TMUX2 set -g window-size manual || exit 1 $TMUX2 set -g window-size manual || exit 1