4 files changed, 39 insertions, 11 deletions
diff --git a/regress/capture-pane-hyperlink.sh b/regress/capture-pane-hyperlink.sh
new file mode 100644
index 00000000..681a8e17
--- /dev/null
+++ b/regress/capture-pane-hyperlink.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# capture-pane -e for OSC 8 hyperlink
+
+PATH=/bin:/usr/bin
+TERM=screen
+
+[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
+TMUX="$TEST_TMUX -Ltest"
+TMP=$(mktemp)
+TMP2=$(mktemp)
+trap "rm -f $TMP $TMP2" 0 1 15
+$TMUX kill-server 2>/dev/null
+
+do_test() {
+  $TMUX -f/dev/null new -d "
+  printf '$1'
+  $TMUX capturep -peS0 -E1 >$TMP"
+  echo $2 > $TMP2
+  sleep 1
+  cmp $TMP $TMP2 || exit 1
+  return 0
+}
+
+do_test '\033]8;id=1;https://github.com\033\\test1\033]8;;\033\\\n' '\033]8;id=1;https://github.com\033\\test1\033]8;;\033\\\n' || exit 1
+do_test '\033]8;;https://github.com/tmux/tmux\033\\test1\033]8;;\033\\\n' '\033]8;;https://github.com/tmux/tmux\033\\test1\033]8;;\033\\\n' || exit 1
+
+$TMUX has 2>/dev/null && exit 1
+
+exit 0
diff --git a/regress/capture-pane-sgr0.sh b/regress/capture-pane-sgr0.sh
index 0dd9cd82..6a19ac8a 100644
--- a/regress/capture-pane-sgr0.sh
+++ b/regress/capture-pane-sgr0.sh
@@ -22,8 +22,8 @@ $TMUX -f/dev/null new -d "
 sleep 1
 
 (
-	printf '\033[1m\033[31m\033[42mabc\033[0m\033[31m\033[49mdef\033[39m\n'
-	printf '\033[100m bright bg \033[49m\n'
+	printf '\033[1m\033[31m\033[42mabc\033[0m\033[31m\033[49mdef\n'
+	printf '\033[39m\033[100m bright bg\n'
 ) | cmp - $TMP || exit 1
 
 $TMUX has 2>/dev/null && exit 1
diff --git a/regress/if-shell-error.sh b/regress/if-shell-error.sh
index 24dc578e..2896d9aa 100644
--- a/regress/if-shell-error.sh
+++ b/regress/if-shell-error.sh
@@ -11,16 +11,13 @@ TMUX="$TEST_TMUX -Ltest"
 $TMUX kill-server 2>/dev/null
 
 TMP=$(mktemp)
-trap "rm -f $TMP" 0 1 15
+OUT=$(mktemp)
+trap "rm -f $TMP $OUT" 0 1 15
 
 cat <<EOF >$TMP
 if 'true' 'wibble wobble'
 EOF
 
-$TMUX -f$TMP new -d || exit 1
-sleep 1
-E=$($TMUX display -p '#{pane_in_mode}')
-$TMUX kill-server 2>/dev/null
-[ "$E" = "1" ] || exit 1
-
-exit 0
+$TMUX -f$TMP -C new <<EOF >$OUT
+EOF
+grep -q "^%config-error $TMP:1: $TMP:1: unknown command: wibble$" $OUT
diff --git a/regress/kill-session-process-exit.sh b/regress/kill-session-process-exit.sh
index 69ee27a2..82cd7412 100644
--- a/regress/kill-session-process-exit.sh
+++ b/regress/kill-session-process-exit.sh
@@ -8,13 +8,14 @@ TERM=screen
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
 TMUX="$TEST_TMUX -Ltest"
 $TMUX kill-server 2>/dev/null
+sleep 1
 
 $TMUX -f/dev/null new -d 'sleep 1000' || exit 1
 P=$($TMUX display -pt0:0.0 '#{pane_pid}')
 $TMUX -f/dev/null new -d || exit 1
 sleep 1
 $TMUX kill-session -t0:
-sleep 1
+sleep 3
 kill -0 $P 2>/dev/null && exit 1
 $TMUX kill-server 2>/dev/null