diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/nvim/message.c | 16 | ||||
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_timers.vim | 2 |
4 files changed, 25 insertions, 8 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 22f3153230..06957dd77d 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -552,19 +552,19 @@ if(CLANG_ASAN_UBSAN) else() set(SANITIZE_RECOVER -fno-sanitize-recover) # Clang 3.5- endif() - set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-DEXITFREE ") - set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "${SANITIZE_RECOVER} -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address -fsanitize=undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/src/.asan-blacklist") + set_property(TARGET nvim APPEND PROPERTY COMPILE_DEFINITIONS EXITFREE) + set_property(TARGET nvim APPEND PROPERTY COMPILE_OPTIONS ${SANITIZE_RECOVER} -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address -fsanitize=undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/src/.asan-blacklist) set_property(TARGET nvim APPEND_STRING PROPERTY LINK_FLAGS "-fsanitize=address -fsanitize=undefined ") elseif(CLANG_MSAN) message(STATUS "Enabling Clang memory sanitizer for nvim.") - set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-DEXITFREE ") - set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -fno-optimize-sibling-calls ") + set_property(TARGET nvim APPEND PROPERTY COMPILE_DEFINITIONS EXITFREE) + set_property(TARGET nvim APPEND PROPERTY COMPILE_OPTIONS -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -fno-optimize-sibling-calls) set_property(TARGET nvim APPEND_STRING PROPERTY LINK_FLAGS "-fsanitize=memory -fsanitize-memory-track-origins ") elseif(CLANG_TSAN) message(STATUS "Enabling Clang thread sanitizer for nvim.") - set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-DEXITFREE ") - set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-fsanitize=thread ") - set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-fPIE ") + set_property(TARGET nvim APPEND PROPERTY COMPILE_DEFINITIONS EXITFREE) + set_property(TARGET nvim APPEND PROPERTY COMPILE_OPTIONS -fsanitize=thread) + set_property(TARGET nvim APPEND PROPERTY COMPILE_OPTIONS -fPIE) set_property(TARGET nvim APPEND_STRING PROPERTY LINK_FLAGS "-fsanitize=thread ") endif() diff --git a/src/nvim/message.c b/src/nvim/message.c index 6e935022ca..9bea9f5c4a 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -582,9 +582,25 @@ static bool emsg_multiline(const char *s, bool multiline) } redir_write(s, strlen(s)); } + + // Log (silent) errors as debug messages. + if (sourcing_name != NULL && sourcing_lnum != 0) { + DLOG("(:silent) %s (%s (line %ld))", + s, sourcing_name, (long)sourcing_lnum); + } else { + DLOG("(:silent) %s", s); + } + return true; } + // Log editor errors as INFO. + if (sourcing_name != NULL && sourcing_lnum != 0) { + ILOG("%s (%s (line %ld))", s, sourcing_name, (long)sourcing_lnum); + } else { + ILOG("%s", s); + } + ex_exitval = 1; // Reset msg_silent, an error causes messages to be switched back on. diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index 5c62538b7d..4ddb15c9de 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -286,6 +286,7 @@ let s:flaky_tests = [ \ 'Test_quoteplus()', \ 'Test_quotestar()', \ 'Test_reltime()', + \ 'Test_repeat_many()', \ 'Test_repeat_three()', \ 'Test_terminal_composing_unicode()', \ 'Test_terminal_redir_file()', diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim index 9384989a35..24c735865c 100644 --- a/src/nvim/testdir/test_timers.vim +++ b/src/nvim/testdir/test_timers.vim @@ -48,7 +48,7 @@ func Test_repeat_many() endif sleep 200m call timer_stop(timer) - call assert_inrange((has('mac') ? 1 : 2), LoadAdjust(4), g:val) + call assert_inrange((has('mac') ? 1 : 2), LoadAdjust(5), g:val) endfunc func Test_with_partial_callback() |