aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2018-02-01 13:27:51 -0500
committerJames McCoy <jamessan@jamessan.com>2018-02-02 07:28:56 -0500
commit5da6f0e903f2eb76e72bbb3c098d4908d1f3b1ad (patch)
tree71d1c2874024e2e289762334cda9a99848de6800
parent86ee92f2a244da3cfb8698bee0dbc02579c0c6fa (diff)
downloadrneovim-5da6f0e903f2eb76e72bbb3c098d4908d1f3b1ad.tar.gz
rneovim-5da6f0e903f2eb76e72bbb3c098d4908d1f3b1ad.tar.bz2
rneovim-5da6f0e903f2eb76e72bbb3c098d4908d1f3b1ad.zip
travis: Don't run unit tests for functionaltest-lua build
-rw-r--r--ci/common/build.sh8
-rwxr-xr-xci/run_tests.sh4
2 files changed, 8 insertions, 4 deletions
diff --git a/ci/common/build.sh b/ci/common/build.sh
index adfd7b9e8a..2748b15b0d 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -71,9 +71,11 @@ build_nvim() {
exit 1
fi
- echo "Building nvim-test."
- if ! top_make nvim-test ; then
- exit 1
+ if test "${FUNCTIONALTEST}" != "functionaltest-lua"; then
+ echo "Building nvim-test."
+ if ! top_make nvim-test ; then
+ exit 1
+ fi
fi
fi
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index a0bf6e010d..c175910da5 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -22,7 +22,9 @@ enter_suite tests
if test "$CLANG_SANITIZER" != "TSAN" ; then
# Additional threads are only created when the builtin UI starts, which
# doesn't happen in the unit/functional tests
- run_test run_unittests
+ if test "${FUNCTIONALTEST}" != "functionaltest-lua"; then
+ run_test run_unittests
+ fi
run_test run_functionaltests
fi
run_test run_oldtests