diff options
| author | John Hood <cgull@glup.org> | 2017-05-28 16:24:47 -0400 |
|---|---|---|
| committer | John Hood <cgull@glup.org> | 2017-05-28 21:19:03 -0400 |
| commit | 7c68667bc0cdb3f463d3dc25557f2d7426305335 (patch) | |
| tree | 7a3b32577457b7c5f1919a153721a4899a0cb205 | |
| parent | 73fc71376aa2ff6b3f5c7d28b3dfb01af153cbd6 (diff) | |
Explicitly set tmux window size in tests.
Recent versions of tmux master gave us an 80x23 window. tmux has been
fixed to default to 80x24, and also to allow setting window sizes in
control mode. These flags fortunately do not conflict with older
versions tmux. So we use them to avoid problems going forward.
| -rwxr-xr-x | src/tests/e2e-test | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tests/e2e-test b/src/tests/e2e-test index 7d92515..c9f3b71 100755 --- a/src/tests/e2e-test +++ b/src/tests/e2e-test @@ -244,7 +244,10 @@ for run in $server_tests; do # XXX this ignores $TMPDIR, because it results in an overlong pathname on OS X tmux_socket="/tmp/.tmux-mosh-test-$$" ln -fs "${tmux_socket}" "${test_dir}/tmux-socket" - ${tmux_stdin} tmux -f /dev/null -S "${tmux_socket}" -C new-session "${srcdir}/print-exitstatus ${client_wrapper} ${sut} ${server_wrapper} \"${PWD}/${test_dir}/${run}\" \"${PWD}/${test_script} ${run}\"" > "${test_dir}/${run}.tmux.log" + # tmux <= 2.5 ignore -x/-y, but the client sets the session to 80x24. + # tmux from 2017-05-27 and later should default to an 80x24 session, + # but do use -x/-y on control-master clients. + ${tmux_stdin} tmux -f /dev/null -S "${tmux_socket}" -C new-session -x 80 -y 24 "${srcdir}/print-exitstatus ${client_wrapper} ${sut} ${server_wrapper} \"${PWD}/${test_dir}/${run}\" \"${PWD}/${test_script} ${run}\"" > "${test_dir}/${run}.tmux.log" rv=$? rm -f "${tmux_socket}" "${test_dir}/tmux-socket" if [ $rv -ne 0 ]; then |