aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-06-03 14:15:36 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-06-03 14:15:36 -0400
commitf421757e57903d07ae905906b9da51abba7af2b4 (patch)
treeead291985448f07c948b2de3748a2ad22af359c6
parentabe47d5f64b2748633d1262e2b395ce8322852a7 (diff)
downloadrneovim-f421757e57903d07ae905906b9da51abba7af2b4.tar.gz
rneovim-f421757e57903d07ae905906b9da51abba7af2b4.tar.bz2
rneovim-f421757e57903d07ae905906b9da51abba7af2b4.zip
reorg
-rw-r--r--Makefile2
-rw-r--r--neovim.rb9
-rw-r--r--src/.asan-blacklist (renamed from .asan-blacklist)0
-rw-r--r--src/.valgrind.supp (renamed from .valgrind.supp)0
-rw-r--r--src/Doxyfile (renamed from Doxyfile)0
-rwxr-xr-xsrc/clint.py (renamed from clint.py)0
-rw-r--r--src/nvim/CMakeLists.txt2
-rw-r--r--src/nvim/eval.c5
-rw-r--r--src/nvim/testdir/Makefile2
9 files changed, 5 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 9d01347989..5b04b74139 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ install: | nvim
+$(BUILD_CMD) -C build install
clint:
- cmake -DLINT_PRG=./clint.py \
+ cmake -DLINT_PRG=./src/clint.py \
-DLINT_DIR=src \
-DLINT_SUPPRESS_URL="$(DOC_DOWNLOAD_URL_BASE)$(CLINT_ERRORS_FILE_PATH)" \
-P cmake/RunLint.cmake
diff --git a/neovim.rb b/neovim.rb
deleted file mode 100644
index 859ebdf39d..0000000000
--- a/neovim.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-odie <<-EOS.undent
-
- Whoops, the neovim Homebrew Formula has moved! Please instead run:
-
- brew tap neovim/homebrew-neovim
- brew install --HEAD neovim
-
- Thanks!
-EOS
diff --git a/.asan-blacklist b/src/.asan-blacklist
index 63558170b3..63558170b3 100644
--- a/.asan-blacklist
+++ b/src/.asan-blacklist
diff --git a/.valgrind.supp b/src/.valgrind.supp
index 8b630fcaaf..8b630fcaaf 100644
--- a/.valgrind.supp
+++ b/src/.valgrind.supp
diff --git a/Doxyfile b/src/Doxyfile
index de31c8355f..de31c8355f 100644
--- a/Doxyfile
+++ b/src/Doxyfile
diff --git a/clint.py b/src/clint.py
index c19ba4b7ae..c19ba4b7ae 100755
--- a/clint.py
+++ b/src/clint.py
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index ab6f69f66c..5a3db74903 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -269,7 +269,7 @@ if(CLANG_ASAN_UBSAN)
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}/.asan-blacklist")
+ 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_STRING PROPERTY LINK_FLAGS "-fsanitize=address -fsanitize=undefined ")
elseif(CLANG_MSAN)
message(STATUS "Enabling Clang memory sanitizer for nvim.")
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 92e572db2f..7edf511c18 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -22111,9 +22111,8 @@ bool eval_has_provider(char *name)
return false;
}
-// Compute the `DictWatcher` address from a QUEUE node. This only exists because
-// ASAN doesn't handle `QUEUE_DATA` pointer arithmetic, and we blacklist this
-// function on .asan-blacklist.
+// Compute the `DictWatcher` address from a QUEUE node. This only exists for
+// .asan-blacklist (ASAN doesn't handle QUEUE_DATA pointer arithmetic).
static DictWatcher *dictwatcher_node_data(QUEUE *q)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET
{
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 94643bc843..b06efc9ffb 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -60,7 +60,7 @@ ifdef USE_VALGRIND
TOOL := valgrind -q \
-q \
$(VALGRIND_TOOL) \
- --suppressions=../../../.valgrind.supp \
+ --suppressions=../../.valgrind.supp \
--error-exitcode=123 \
--log-file=valgrind.\%p.$* \
$(VGDB) \