diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-11-13 14:13:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 14:13:42 -0500 |
| commit | 7c4f349661bd7e66f22b3a0903ffb7b8db1222e7 (patch) | |
| tree | e8227d5e2a30f9424a1c405a79766e5dc3779e6c /src | |
| parent | aaca2c1c4d07d5bb9dd297b8e21e4a66acfb8ad3 (diff) | |
| parent | 7ac3c39e39effcbf57f5622efde0fce20eac2fdd (diff) | |
| download | rneovim-7c4f349661bd7e66f22b3a0903ffb7b8db1222e7.tar.gz rneovim-7c4f349661bd7e66f22b3a0903ffb7b8db1222e7.tar.bz2 rneovim-7c4f349661bd7e66f22b3a0903ffb7b8db1222e7.zip | |
Merge pull request #13287 from jamessan/github-actions
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | src/nvim/testdir/runnvim.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 9b6e9fe13e..8ec087c626 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -617,14 +617,14 @@ if(CLANG_ASAN_UBSAN) message(STATUS "Enabling Clang address sanitizer and undefined behavior sanitizer for nvim.") check_c_compiler_flag(-fno-sanitize-recover=all SANITIZE_RECOVER_ALL) if(SANITIZE_RECOVER_ALL) - if(TRAVIS_CI_BUILD) + if(CI_BUILD) # Try to recover from all sanitize issues so we get reports about all failures set(SANITIZE_RECOVER -fsanitize-recover=all) # Clang 3.6+ else() set(SANITIZE_RECOVER -fno-sanitize-recover=all) # Clang 3.6+ endif() else() - if(TRAVIS_CI_BUILD) + if(CI_BUILD) # Try to recover from all sanitize issues so we get reports about all failures set(SANITIZE_RECOVER -fsanitize-recover) # Clang 3.5- else() diff --git a/src/nvim/testdir/runnvim.sh b/src/nvim/testdir/runnvim.sh index 72f9254635..25cb8437b4 100755 --- a/src/nvim/testdir/runnvim.sh +++ b/src/nvim/testdir/runnvim.sh @@ -66,7 +66,7 @@ main() {( fi fi if test "$FAILED" = 1 ; then - travis_fold start "$NVIM_TEST_CURRENT_SUITE/$test_name" + ci_fold start "$NVIM_TEST_CURRENT_SUITE/$test_name" fi valgrind_check . if test -n "$LOG_DIR" ; then @@ -78,7 +78,7 @@ main() {( fi rm -f "$tlog" if test "$FAILED" = 1 ; then - travis_fold end "$NVIM_TEST_CURRENT_SUITE/$test_name" + ci_fold end "$NVIM_TEST_CURRENT_SUITE/$test_name" fi if test "$FAILED" = 1 ; then echo "Test $test_name failed, see output above and summary for more details" >> test.log |