From ee374116354cd2b018298327c0fad47c2fbde94a Mon Sep 17 00:00:00 2001
From: Jerome Reybert <jreybert@gmail.com>
Date: Sat, 24 Oct 2015 10:30:30 +0200
Subject: [PATCH] test/run.sh: some updates for integration
---
.travis.yml | 2 +-
test/run.sh | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ea98bab..184293b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@ install:
before_script:
- git clone https://github.com/jreybert/djooks
- - git clone https://github.com/jreybert/vader.vim
+ - git clone https://github.com/junegunn/vader.vim
script:
- ./test/run.sh . vader.vim djooks $VIM_VERSION
diff --git a/test/run.sh b/test/run.sh
index e6f4f54..ded972c 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -26,7 +26,7 @@ fi
pushd $TEST_PATH
git config --local user.email 'tester@vimagit.org'
git config --local user.name 'vimagit tester'
-export TEST_HEAD_SHA1='bb86d5f'
+export TEST_HEAD_SHA1='origin/vimagit_test-1.4'
git submodule update
git show $TEST_HEAD_SHA1 --stat
git reset $TEST_HEAD_SHA1~1 && git status --porcelain && git reset --hard $TEST_HEAD_SHA1
@@ -40,6 +40,9 @@ else
VIM=vim
fi
+echo 'Git version'
+git --version
+
echo 'Vim version'
$VIM --version
@@ -75,8 +78,7 @@ for script in ${!test_scripts[@]}; do
set rtp+=$VADER_PATH
filetype plugin indent on
syntax enable
- let g:vader_show_version=0
-EOF) -c "Vader! $VIMAGIT_PATH/test/$script"
+EOF) -c "Vader! $VIMAGIT_PATH/test/$script 2> >(sed -n '/^Starting Vader/,$p')"
done
done
--
GitLab