From 38b4a646075e19500744ae56e0ee9a9a204fce44 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 23 Apr 2017 20:10:00 +0200 Subject: [PATCH] fixup! fixup! fixup! fixup! fixup! Travis: test more Zsh versions --- .travis.yml | 10 +++++++--- Makefile | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbd8479..591f08c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,13 @@ install: exit 1 fi else - (curl -SL https://downloads.sourceforge.net/project/zsh/zsh/$TEST_ZSH/zsh-$TEST_ZSH.tar.xz | tar --xz -xf - - cd zsh-$TEST_ZSH - ./configure && sudo make && sudo make install) + if [ "$TEST_ZSH" = 5.0.8 ]; then + curl -SL https://downloads.sourceforge.net/project/zsh/zsh/$TEST_ZSH/zsh-$TEST_ZSH.tar.bz2 | tar --bzip2 -xf - + else + curl -SL https://downloads.sourceforge.net/project/zsh/zsh/$TEST_ZSH/zsh-$TEST_ZSH.tar.xz | tar --xz -xf - + fi + (cd zsh-$TEST_ZSH + ./configure && sudo make && sudo make install) fi - pip install --user cram - export SHELL=zsh diff --git a/Makefile b/Makefile index 745a65a..3576937 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ test_full: ret=0; \ for i in $(wildcard tests/ZDOTDIR*); do \ echo "zsh=$zsh ZDOTDIR=$$i"; \ - SHELL=$(TEST_SHELL) ZDOTDIR=${CURDIR}/$$i cram --shell=$(TEST_SHELL) -v tests || ret=$$?; \ + SHELL=$(TEST_SHELL) ZDOTDIR=${CURDIR}/$$i cram --shell=$(TEST_SHELL) -v tests || ret=$$(ret+1)); \ echo; \ done; \ exit $$ret