From 47795d16952b866841b1c4cfb963e761cc438f96 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 29 May 2019 14:40:41 +0100
Subject: [PATCH 1/2] Update .travis.yml from master.

---
 .travis.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2188eec0..fd85bf61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,16 @@
 language: c
-matrix:
-    include:
-        - compiler: gcc
-        - compiler: clang
-          env: CFLAGS="-g -O2"
+
+os:
+    - linux
+    - osx
+
+compiler:
+    - gcc
+    - clang
+
 before_install:
-    - sudo apt-get update -qq
-    - sudo apt-get -y install bison debhelper autotools-dev dh-autoreconf file libncurses5-dev libevent-dev pkg-config libutempter-dev build-essential
-script: (CFLAGS= ./autogen.sh) && ./configure --enable-debug && make
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; fi
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -y install bison autotools-dev libncurses5-dev libevent-dev pkg-config libutempter-dev build-essential; fi
+
+script:
+    - ./autogen.sh && ./configure && make

From a05c3a7aa6071032bed8725b27dca8678b481dc6 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 29 May 2019 20:43:11 +0100
Subject: [PATCH 2/2] Add command order test.

---
 regress/command-order.sh | 53 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 regress/command-order.sh

diff --git a/regress/command-order.sh b/regress/command-order.sh
new file mode 100644
index 00000000..fb4e0324
--- /dev/null
+++ b/regress/command-order.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# new-session without clients should be the right size
+
+PATH=/bin:/usr/bin
+TERM=screen
+
+[ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
+TMUX="$TEST_TMUX -Ltest"
+$TMUX kill-server 2>/dev/null
+
+TMP=$(mktemp)
+trap "rm -f $TMP" 0 1 15
+
+cat <<EOF >$TMP
+new -sfoo -nfoo0; neww -nfoo1; neww -nfoo2
+new -sbar -nbar0; neww -nbar1; neww -nbar2
+EOF
+$TMUX -f$TMP start </dev/null || exit 1
+sleep 1
+$TMUX lsw -aF '#{session_name},#{window_name}'|sort >$TMP || exit 1
+cat <<EOF|cmp -s $TMP - || exit 1
+bar,bar0
+bar,bar1
+bar,bar2
+foo,foo0
+foo,foo1
+foo,foo2
+EOF
+$TMUX kill-server 2>/dev/null
+
+cat <<EOF >$TMP
+new -sfoo -nfoo0
+neww -nfoo1
+neww -nfoo2
+new -sbar -nbar0
+neww -nbar1
+neww -nbar2
+EOF
+$TMUX -f$TMP start </dev/null || exit 1
+sleep 1
+$TMUX lsw -aF '#{session_name},#{window_name}'|sort >$TMP || exit 1
+cat <<EOF|cmp -s $TMP - || exit 1
+bar,bar0
+bar,bar1
+bar,bar2
+foo,foo0
+foo,foo1
+foo,foo2
+EOF
+$TMUX kill-server 2>/dev/null
+
+exit 0