Fix a couple of tests and add -f/dev/null to them all.

2026-06-20 09:25:12 +00:00 · 2026-06-07 16:11:38 +01:00
parent 1fbc51b69f
commit e0ebae4481
34 changed files with 51 additions and 54 deletions
--- 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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null
-TMUX2="$TEST_TMUX -Ltest2"
+TMUX2="$TEST_TMUX -Ltest2 -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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null
-TMUX_OUTER="$TEST_TMUX -Ltest2"
+TMUX_OUTER="$TEST_TMUX -Ltest2 -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/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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- 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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- 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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- 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 -f/dev/null -Ltest"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $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 -f/dev/null -Ltest"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

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

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

 TMP=$(mktemp)
-TMP2=$(mktemp)
-TMP3=$(mktemp)
-TMP4=$(mktemp)
-TMP5=$(mktemp)
-trap "rm -f $TMP $TMP2 $TMP3 $TMP4 $TMP5; $TMUX kill-server 2>/dev/null" 0 1 15
+trap "rm -f $TMP; $TMUX kill-server 2>/dev/null" 0 1 15

 $TMUX -f/dev/null new -d -x80 -y24 || exit 1
 sleep 1
@@ -35,13 +31,14 @@ query_decrpm() {
 	_outfile=$1
 	_mode=$2
 	_setup=$3
+	_n=$4

 	$TMUX respawnw -k -t:0 -- sh -c "
 		exec 2>/dev/null
 		stty raw -echo
 		${_setup:+printf '$_setup'; sleep 0.2}
 		printf '\033[%s\$p' "$_mode"
-		dd bs=1 count=11 2>/dev/null | cat -v > $_outfile
+		dd bs=1 count=$_n 2>/dev/null | cat -v > $_outfile
 		sleep 0.2
 	" || exit 1
 	sleep 2
@@ -50,7 +47,7 @@ query_decrpm() {
 # ------------------------------------------------------------------
 # Test 1: mode 2026 should be reset by default (Ps=2)
 # ------------------------------------------------------------------
-query_decrpm "$TMP" "?2026"
+query_decrpm "$TMP" "?2026" '' 11

 actual=$(cat "$TMP")
 expected='^[[?2026;2$y'
@@ -67,9 +64,9 @@ fi
 # ------------------------------------------------------------------
 # Test 2: set mode 2026 (SM ?2026), then query (expect Ps=1)
 # ------------------------------------------------------------------
-query_decrpm "$TMP2" "?2026" '\033[?2026h'
+query_decrpm "$TMP" "?2026" '\033[?2026h' 11

-actual=$(cat "$TMP2")
+actual=$(cat "$TMP")
 expected='^[[?2026;1$y'

 if [ "$actual" = "$expected" ]; then
@@ -84,9 +81,9 @@ fi
 # ------------------------------------------------------------------
 # Test 3: mode 25 should return current value
 # ------------------------------------------------------------------
-query_decrpm "$TMP3" "?25" '\033[?25l'
+query_decrpm "$TMP" "?25" '\033[?25l' 9

-actual=$(cat "$TMP3")
+actual=$(cat "$TMP")
 expected='^[[?25;2$y'

 if [ "$actual" = "$expected" ]; then
@@ -101,9 +98,9 @@ fi
 # ------------------------------------------------------------------
 # Test 4: mode ?9999 should return not recognized
 # ------------------------------------------------------------------
-query_decrpm "$TMP4" "?9999" '\033[?9999h'
+query_decrpm "$TMP" "?9999" '\033[?9999h' 11

-actual=$(cat "$TMP4")
+actual=$(cat "$TMP")
 expected='^[[?9999;0$y'

 if [ "$actual" = "$expected" ]; then
@@ -122,9 +119,9 @@ exit $exit_status
 # ------------------------------------------------------------------
 # Test 5: mode 4 is reset by default
 # ------------------------------------------------------------------
-query_decrpm "$TMP5" "4" '\033[4h'
+query_decrpm "$TMP" "4" '\033[4h' 11

-actual=$(cat "$TMP5")
+actual=$(cat "$TMP")
 expected='^[[4;1$y'

 if [ "$actual" = "$expected" ]; then
--- 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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"

 # test_format $format $expected_result
 test_format()
--- 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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

 $TMUX -f/dev/null has -tfoo </dev/null 2>/dev/null && exit 1
--- 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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(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"
+TMUX="$TEST_TMUX -Ltest -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/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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null
 sleep 1

--- 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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

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

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

 TERM=$($TMUX start \; show -gv default-terminal)
 TMP=$(mktemp)
 OUT=$(mktemp)
 SCRIPT=$(mktemp)
-#trap "rm -f $TMP $OUT $SCRIPT" 0 1 15
+trap "rm -f $TMP $OUT $SCRIPT" 0 1 15

 cat <<EOF >$SCRIPT
 (
--- 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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP=$(mktemp)
--- 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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

 $TMUX new -d
--- 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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

 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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null

 TMP1=$(mktemp)
--- 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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null
-TMUX2="$TEST_TMUX -Ltest2"
+TMUX2="$TEST_TMUX -Ltest2 -f/dev/null"
 $TMUX2 kill-server 2>/dev/null

 $TMUX2 -f/dev/null new -d "$TMUX -f/dev/null new -- $shell"
--- 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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 $TMUX kill-server 2>/dev/null
-TMUX2="$TEST_TMUX -Ltest2"
+TMUX2="$TEST_TMUX -Ltest2 -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"
+TMUX="$TEST_TMUX -Ltest -f/dev/null"
 TMP=$(mktemp)
 trap "rm -f $TMP" 0 1 15
 $TMUX kill-server 2>/dev/null