aboutsummaryrefslogtreecommitdiff
path: root/third-party
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-03-27 23:02:27 +0200
committerGitHub <noreply@github.com>2018-03-27 23:02:27 +0200
commit3f3de9b1a95d273463a87516365510dbffcaf3d2 (patch)
treec5a1d424bc596b0b49c7b0f801c1c1bb864d0e84 /third-party
parent8d5a46e77b1e0c77296f1d0d192e7906dd37c0d7 (diff)
parent393935c32d48c3a1a02a78df03ea8c67e0a8fb20 (diff)
downloadrneovim-3f3de9b1a95d273463a87516365510dbffcaf3d2.tar.gz
rneovim-3f3de9b1a95d273463a87516365510dbffcaf3d2.tar.bz2
rneovim-3f3de9b1a95d273463a87516365510dbffcaf3d2.zip
Merge #8183 'build/msvc: Fix functional tests'
MSBuild still returns a non-zero exit code because it detects the word "error" in the stdout which is caused by some of the test names such as api/buf {get,set,del}_line get_line : out-of-bounds is an error. CMake mailing list thread: https://cmake.org/pipermail/cmake-developers/2015-October/026775.html There isn't any good solution for it, so I modified the build script to detect the error message printed by RunTests.cmake.
Diffstat (limited to 'third-party')
-rw-r--r--third-party/patches/libvterm-Remove-VLAs-for-MSVC.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/third-party/patches/libvterm-Remove-VLAs-for-MSVC.patch b/third-party/patches/libvterm-Remove-VLAs-for-MSVC.patch
index 3fb18351be..e999c0fa9b 100644
--- a/third-party/patches/libvterm-Remove-VLAs-for-MSVC.patch
+++ b/third-party/patches/libvterm-Remove-VLAs-for-MSVC.patch
@@ -23,7 +23,7 @@ index 84299df..f9aabb3 100644
// We'll have at most len codepoints
- uint32_t codepoints[len];
-+ uint32_t* codepoints = _alloca(len);
++ uint32_t* codepoints = _alloca(len * sizeof(uint32_t));
int npoints = 0;
size_t eaten = 0;
@@ -32,7 +32,7 @@ index 84299df..f9aabb3 100644
int width = 0;
- uint32_t chars[glyph_ends - glyph_starts + 1];
-+ uint32_t* chars = _alloca(glyph_ends - glyph_starts + 1);
++ uint32_t* chars = _alloca((glyph_ends - glyph_starts + 1) * sizeof(uint32_t));
for( ; i < glyph_ends; i++) {
chars[i - glyph_starts] = codepoints[i];