From f2283b0cb57af9d82dd51de35877f25dc41ff7a3 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 28 Apr 2025 08:57:10 +0100
Subject: [PATCH] Fix some regress tests.

---
 regress/copy-mode-test-emacs.sh    |  2 +-
 regress/copy-mode-test-vi.sh       |  2 +-
 regress/new-session-environment.sh | 10 +++++-----
 regress/run-shell-output.sh        |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/regress/copy-mode-test-emacs.sh b/regress/copy-mode-test-emacs.sh
index cee0078d..ad863030 100644
--- a/regress/copy-mode-test-emacs.sh
+++ b/regress/copy-mode-test-emacs.sh
@@ -42,7 +42,7 @@ $TMUX send-keys -X begin-selection
 $TMUX send-keys -X next-word-end
 $TMUX send-keys -X next-word-end
 $TMUX send-keys -X copy-selection
-[ "$($TMUX show-buffer)" = "$(printf "words\n        Indented")" ] || exit 1
+[ "$($TMUX show-buffer)" = "$(printf "words\n\tIndented")" ] || exit 1
 
 # Test that `next-word` wraps around un-indented line breaks.
 $TMUX send-keys -X next-word
diff --git a/regress/copy-mode-test-vi.sh b/regress/copy-mode-test-vi.sh
index 8146e456..911a1f1b 100644
--- a/regress/copy-mode-test-vi.sh
+++ b/regress/copy-mode-test-vi.sh
@@ -41,7 +41,7 @@ $TMUX send-keys -X begin-selection
 $TMUX send-keys -X next-word-end
 $TMUX send-keys -X next-word-end
 $TMUX send-keys -X copy-selection
-[ "$($TMUX show-buffer)" = "$(printf "words\n        Indented")" ] || exit 1
+[ "$($TMUX show-buffer)" = "$(printf "words\n\tIndented")" ] || exit 1
 
 # Test that `next-word` wraps around un-indented line breaks.
 $TMUX send-keys -X next-word
diff --git a/regress/new-session-environment.sh b/regress/new-session-environment.sh
index d53f204e..84062aba 100644
--- a/regress/new-session-environment.sh
+++ b/regress/new-session-environment.sh
@@ -3,16 +3,16 @@
 # new session environment
 
 PATH=/bin:/usr/bin
-TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
 TMUX="$TEST_TMUX -Ltest"
 $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
 (
@@ -32,7 +32,7 @@ EOF
 	$TMUX -f$TMP start) || exit 1
 sleep 1
 (cat <<EOF|cmp -s - $OUT) || exit 1
-TERM=screen
+TERM=$TERM
 PWD=/
 PATH=1
 SHELL=/bin/sh
@@ -43,7 +43,7 @@ EOF
 	$TMUX -f$TMP new -d -- /bin/sh $SCRIPT) || exit 1
 sleep 1
 (cat <<EOF|cmp -s - $OUT) || exit 1
-TERM=screen
+TERM=$TERM
 PWD=/
 PATH=2
 SHELL=/bin/sh
@@ -54,7 +54,7 @@ EOF
 	$TMUX -f/dev/null new -d source $TMP) || exit 1
 sleep 1
 (cat <<EOF|cmp -s - $OUT) || exit 1
-TERM=screen
+TERM=$TERM
 PWD=/
 PATH=2
 SHELL=/bin/sh
diff --git a/regress/run-shell-output.sh b/regress/run-shell-output.sh
index 2417264b..fd9634d6 100644
--- a/regress/run-shell-output.sh
+++ b/regress/run-shell-output.sh
@@ -13,10 +13,10 @@ $TMUX kill-server 2>/dev/null
 TMP=$(mktemp)
 trap "rm -f $TMP" 0 1 15
 
-$TMUX -f/dev/null new -d "tmux run 'echo foo' >$TMP" || exit 1
+$TMUX -f/dev/null new -d "$TMUX run 'echo foo' >$TMP; sleep 10" || exit 1
 sleep 1 && [ "$(cat $TMP)" = "foo" ] || exit 1
 
-$TMUX -f/dev/null new -d "tmux run -t: 'echo foo' >$TMP; sleep 10" || exit 1
+$TMUX -f/dev/null new -d "$TMUX run -t: 'echo foo' >$TMP; sleep 10" || exit 1
 sleep 1 && [ "$(cat $TMP)" = "" ] || exit 1
 [ "$($TMUX display -p '#{pane_mode}')" = "view-mode" ] || exit 1