mirror of
https://github.com/tmux/tmux.git
synced 2026-06-22 03:16:47 +00:00
Fix a couple of tests and add -f/dev/null to them all.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user