From 4c3ccd38ce0bb90ff1b700e5ce9b64afb03c668c Mon Sep 17 00:00:00 2001 From: Jerome Reybert <jreybert@gmail.com> Date: Tue, 6 Oct 2015 17:38:58 +0200 Subject: [PATCH] test/: add OS osx for test --- .travis.yml | 8 ++++++++ test/run.sh | 12 ++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05c3933..5df2b12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,19 @@ language: vim sudo: false +os: + - linux + - osx + env: matrix: - TEST_SUB_PATH=./ - TEST_SUB_PATH=books/templates/ +matrix: + allow_failures: + - os: osx + before_script: - git clone https://github.com/jreybert/djooks - git clone https://github.com/junegunn/vader.vim diff --git a/test/run.sh b/test/run.sh index fc0e266..96d7578 100755 --- a/test/run.sh +++ b/test/run.sh @@ -5,10 +5,14 @@ if [[ $# -ne 3 ]]; then exit 1 fi -export VIMAGIT_PATH=$(readlink -f $1) -export VADER_PATH=$(readlink -f $2) -export TEST_PATH=$(readlink -f $3) -export TEST_SUB_PATH=$(readlink -f $TEST_PATH/$TEST_SUB_PATH) +function prealpath() { +python -c "import os,sys; print(os.path.realpath(os.path.expanduser(sys.argv[1])))" "${1}" +} + +export VIMAGIT_PATH=$(prealpath $1) +export VADER_PATH=$(prealpath $2) +export TEST_PATH=$(prealpath $3) +export TEST_SUB_PATH=$(prealpath $TEST_PATH/$TEST_SUB_PATH) if [[ ! ( -d $VIMAGIT_PATH && -d $VADER_PATH && -d $TEST_PATH && -d $TEST_SUB_PATH) ]]; then echo "can't access to one of them '$VIMAGIT_PATH' '$VADER_PATH' '$TEST_PATH' '$TEST_SUB_PATH'" -- GitLab