Merge pull request #1404 from ZyX-I/tcsh-whitelist

Do not use tcsh, mksh, busybox and socat from deps
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2015-08-21 18:18:56 +03:00
commit eba68f05cb
2 changed files with 4 additions and 8 deletions

View File

@ -8,11 +8,11 @@ addons:
packages: packages:
- libssl1.0.0 - libssl1.0.0
- zsh - zsh
# - tcsh - tcsh
# - mksh - mksh
# - busybox - busybox
# - rc # - rc
# - socat - socat
- bc - bc
language: python language: python
install: tests/install.sh install: tests/install.sh

View File

@ -11,10 +11,6 @@ FAILED=0
if test "$TRAVIS" = true ; then if test "$TRAVIS" = true ; then
export PATH="$HOME/opt/fish/bin:${PATH}" export PATH="$HOME/opt/fish/bin:${PATH}"
export PATH="$PWD/tests/bot-ci/deps/rc:$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/tcsh:$PATH"
export PATH="$PWD/tests/bot-ci/deps/socat:$PATH"
if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
export PATH="$HOME/opt/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}/bin:${PATH}" export PATH="$HOME/opt/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}/bin:${PATH}"