From 8f7ea1f5b63362ed39ad9a076b434e6ced552bee Mon Sep 17 00:00:00 2001
From: Tair Sabyrgaliyev <tair.sabirgaliev@gmail.com>
Date: Sat, 10 Jul 2021 01:30:02 +0600
Subject: [PATCH] fix 'socket file name too long' error

In some setups (eg. macports) $tmpdir can expand to more than
100 symbols and tests fail with 'socket file name too long'
errors.

Using relative path to socket file fixes the issue.
---
 tests/checks/tmux-complete.fish | 11 ++++++++---
 tests/checks/tmux-prompt.fish   | 11 +++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/tests/checks/tmux-complete.fish b/tests/checks/tmux-complete.fish
index 83266351f..ab4c78d52 100644
--- a/tests/checks/tmux-complete.fish
+++ b/tests/checks/tmux-complete.fish
@@ -1,15 +1,20 @@
 #RUN: %fish -C 'set -g fish %fish' %s
 #REQUIRES: command -v tmux
 
+set fish (builtin realpath $fish)
+
 # Isolated tmux.
 set -g tmpdir (mktemp -d)
-set -g tmux tmux -S $tmpdir/.tmux-socket -f /dev/null
+
+# Don't CD elsewhere, because tmux socket file is relative to CWD. Using
+# absolute path to socket file is prone to 'socket file name too long' error.
+cd $tmpdir
+
+set -g tmux tmux -S .tmux-socket -f /dev/null
 
 set -g sleep sleep .1
 set -q CI && set sleep sleep 1
 
-set fish (builtin realpath $fish)
-cd $tmpdir
 
 $tmux new-session -x 80 -y 10 -d $fish -C '
     # This is similar to "tests/interactive.config".
diff --git a/tests/checks/tmux-prompt.fish b/tests/checks/tmux-prompt.fish
index 17a5070fb..1bcc273c9 100644
--- a/tests/checks/tmux-prompt.fish
+++ b/tests/checks/tmux-prompt.fish
@@ -1,6 +1,8 @@
 #RUN: %fish -C 'set -g fish %fish' %s
 #REQUIRES: command -v tmux
 
+set fish (builtin realpath $fish)
+
 # Isolated tmux.
 # Note $XDG_CONFIG_HOME typically has a leading double-dot,
 # so our uvars file will leak across runs; therefore
@@ -8,14 +10,15 @@
 set -g tmpdir (mktemp -d)/inner1/inner2/
 mkdir -p $tmpdir
 
-set -g tmux tmux -S $tmpdir/.tmux-socket -f /dev/null
+# Don't CD elsewhere, because tmux socket file is relative to CWD. Using
+# absolute path to socket file is prone to 'socket file name too long' error.
+cd $tmpdir
+
+set -g tmux tmux -S .tmux-socket -f /dev/null
 
 set -g sleep sleep .1
 set -q CI && set sleep sleep 1
 
-set fish (builtin realpath $fish)
-cd $tmpdir
-
 while set -e prompt_var
 end