diff options
| author | James McCoy <jamessan@jamessan.com> | 2018-02-04 07:54:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-04 07:54:30 -0500 |
| commit | 0851057a8deaa1197bd0af22babb62c1146d836c (patch) | |
| tree | a6f796181ed7b76b470d6ce0fbb2df0a836fccae /ci | |
| parent | e2afcfb020fa16b465dd25d3455cd00487e68915 (diff) | |
| parent | de10ea55f370cd57b79d23c2ae09bebf154a0f1a (diff) | |
| download | rneovim-0851057a8deaa1197bd0af22babb62c1146d836c.tar.gz rneovim-0851057a8deaa1197bd0af22babb62c1146d836c.tar.bz2 rneovim-0851057a8deaa1197bd0af22babb62c1146d836c.zip | |
Merge pull request #7957 from jamessan/lua-functionaltest
[RFC] Ensure build works without LuaJIT available
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/common/build.sh | 8 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 4 |
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 |