aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-01-02 01:21:42 -0500
committerJustin M. Keyes <justinkz@gmail.com>2016-01-02 01:21:42 -0500
commitc9df429887972305ecdd25e14bbbd7f0bbf5ea40 (patch)
tree6f669e4847d1ec1781a49dbf75ced84b0ada6206
parent6f25ba0550d722112502e7882153cf4044aec6e2 (diff)
parent22a928aeaccedc9cbb8e1d1f13391687666d8302 (diff)
downloadrneovim-c9df429887972305ecdd25e14bbbd7f0bbf5ea40.tar.gz
rneovim-c9df429887972305ecdd25e14bbbd7f0bbf5ea40.tar.bz2
rneovim-c9df429887972305ecdd25e14bbbd7f0bbf5ea40.zip
Merge pull request #3928 from justinmk/fix_ci_target
test: change CI_TARGET reference to CI
-rwxr-xr-x.ci/script.sh2
-rw-r--r--.travis.yml2
-rw-r--r--test/functional/ui/screen.lua2
3 files changed, 3 insertions, 3 deletions
diff --git a/.ci/script.sh b/.ci/script.sh
index 4d0666ec0e..c3c7b8dfa9 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -4,7 +4,7 @@ set -e
set -o pipefail
if [[ -n "${CI_TARGET}" ]]; then
- make lint
+ make "${CI_TARGET}"
exit 0
fi
diff --git a/.travis.yml b/.travis.yml
index 00c9532363..5329dcaff1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ env:
matrix:
include:
- os: linux
- env: CI_TARGET=clint
+ env: CI_TARGET=lint
- os: linux
compiler: gcc-5
- os: linux
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index e1c2d14759..80f46326ee 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -119,7 +119,7 @@ if os.getenv('VALGRIND') then
default_screen_timeout = default_screen_timeout * 3
end
-if os.getenv('CI_TARGET') then
+if os.getenv('CI') then
default_screen_timeout = default_screen_timeout * 3
end