From dbe7e16520e187090e2f8b8622c168d74bcf5561 Mon Sep 17 00:00:00 2001
From: Foo <kp-pav@yandex.ru>
Date: Mon, 6 Jul 2015 21:13:14 +0300
Subject: [PATCH 1/2] Do not use tcsh from deps

Tcsh was unmasked according to travis-ci/travis-ci#3882 and can now be installed
by travis.
---
 .travis.yml   | 2 +-
 tests/test.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 920141cf..3e40c64f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ addons:
         packages:
             - libssl1.0.0
             - zsh
-            # - tcsh
+            - tcsh
             # - mksh
             # - busybox
             # - rc
diff --git a/tests/test.sh b/tests/test.sh
index 6fe9ade7..0d462dc9 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -13,7 +13,6 @@ if test "$TRAVIS" = true ; then
 	export PATH="$PWD/tests/bot-ci/deps/rc:$PATH"
 	export PATH="$PWD/tests/bot-ci/deps/mksh:$PATH"
 	export PATH="$PWD/tests/bot-ci/deps/busybox:$PATH"
-	export PATH="$PWD/tests/bot-ci/deps/tcsh:$PATH"
 	export PATH="$PWD/tests/bot-ci/deps/socat:$PATH"
 
 	if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then

From c184b2be12b1626d3f3cf8cf2bf6d5199346f2a3 Mon Sep 17 00:00:00 2001
From: Foo <kp-pav@yandex.ru>
Date: Thu, 9 Jul 2015 22:54:49 +0300
Subject: [PATCH 2/2] Also do not use bot-ci mksh, busybox and socat
 dependencies

All of them were whitelisted:
- Mksh was whitelisted in travis-ci/travis-ci#3881.
- Busybox was whitelisted in travis-ci/travis-ci#3880.
- Socat was whitelisted in travis-ci/travis-ci#3883.
---
 .travis.yml   | 6 +++---
 tests/test.sh | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3e40c64f..01429651 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,10 @@ addons:
             - libssl1.0.0
             - zsh
             - tcsh
-            # - mksh
-            # - busybox
+            - mksh
+            - busybox
             # - rc
-            # - socat
+            - socat
             - bc
 language: python
 install: tests/install.sh
diff --git a/tests/test.sh b/tests/test.sh
index 0d462dc9..e2e69dc0 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -11,9 +11,6 @@ FAILED=0
 if test "$TRAVIS" = true ; then
 	export PATH="$HOME/opt/fish/bin:${PATH}"
 	export PATH="$PWD/tests/bot-ci/deps/rc:$PATH"
-	export PATH="$PWD/tests/bot-ci/deps/mksh:$PATH"
-	export PATH="$PWD/tests/bot-ci/deps/busybox:$PATH"
-	export PATH="$PWD/tests/bot-ci/deps/socat:$PATH"
 
 	if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
 		export PATH="$HOME/opt/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}/bin:${PATH}"