From 9fcfd54d90fa724ce052a83f444f5f54625b240c Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@ya.ru>
Date: Thu, 23 Jan 2014 18:33:33 +0400
Subject: [PATCH] Disable fish tests on travis

---
 tests/install.sh          | 4 +++-
 tests/test_shells/test.sh | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/install.sh b/tests/install.sh
index 20ddf745..a448371f 100755
--- a/tests/install.sh
+++ b/tests/install.sh
@@ -9,5 +9,7 @@ if python -c 'import sys; sys.exit(1 * (sys.version_info[0] != 2))' ; then
 		pip install unittest2 argparse
 	fi
 fi
-sudo apt-get install -qq screen zsh fish
+sudo apt-get install -qq screen zsh
+# Travis has too outdated fish. It cannot be used for tests.
+# sudo apt-get install fish
 true
diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh
index c28b9827..3d8b8cc2 100755
--- a/tests/test_shells/test.sh
+++ b/tests/test_shells/test.sh
@@ -18,6 +18,8 @@ run_test() {
 
 	test "x$ONLY_SHELL" = "x" || test "x$ONLY_SHELL" = "x$SH" || return 0
 
+	which "${SH}" || return 0
+
 	screen -L -c tests/test_shells/screenrc -d -m -S "$SESNAME" \
 		env LANG=en_US.UTF-8 BINDFILE="$BINDFILE" "$@"
 	screen -S "$SESNAME" -X readreg a tests/test_shells/input.$SH