rpm/neovim
SHA256
1
0
Fork 0
forked from pool/neovim
Code Pull Requests Activity

- Add 7657-run-tests-aarch64.patch fixing running tests on

Browse Source 
aarch64 (gh#neovim/neovim#7423).

OBS-URL: https://build.opensuse.org/package/show/editors/neovim?expand=0&rev=105
This commit is contained in:
Matej Cepl 2022-04-19 07:48:59 +00:00 committed by Git OBS Bridge
parent 236a563b0d
commit cb9ad5ba67
3 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
7657-run-tests-aarch64.patch Normal file
View File

@ -0,0 +1,41 @@
From 59f4bd435c6754f475dfb61bb6c881ce914b17e6 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 29 Nov 2017 10:07:12 -0500
Subject: [PATCH] unittest: Ignore _Float128 types in ffi
When building with certain GCC versions, a _Float128 type is present
when setting up the ffi for unit tests.
./test/unit/helpers.lua:256: declaration specifier expected near '_Float128' at line 396
/usr/bin/luajit: /usr/share/lua/5.1/busted/runner.lua:99: attempt to concatenate local 'message' (a table value)
stack traceback:
/usr/share/lua/5.1/busted/runner.lua:99: in function 'fn'
/usr/share/lua/5.1/mediator.lua:103: in function 'publish'
/usr/share/lua/5.1/busted/modules/helper_loader.lua:21: in function 'helperLoader'
/usr/share/lua/5.1/busted/runner.lua:147: in function </usr/share/lua/5.1/busted/runner.lua:11>
/usr/bin/busted:3: in main chunk
[C]: at 0x004044a0
CMake Error at /<<PKGBUILDDIR>>/cmake/RunTests.cmake:53 (message):
Running unit tests failed with error: 1.
Since this is being pulled in by a dependency, not directly used by
nvim, just ignore the type.
Closes #7423
---
test/unit/helpers.lua | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 4b9f185156d6..ac5e394a54a9 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -138,6 +138,7 @@ local function filter_complex_blocks(body)
for line in body:gmatch("[^\r\n]+") do
if not (string.find(line, "(^)", 1, true) ~= nil
or string.find(line, "_ISwupper", 1, true)
+ or string.find(line, "_Float128")
or string.find(line, "msgpack_zone_push_finalizer")
or string.find(line, "msgpack_unpacker_reserve_buffer")
or string.find(line, "UUID_NULL") -- static const uuid_t UUID_NULL = {...}

6
neovim.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 19 07:44:58 UTC 2022 - Matej Cepl <mcepl@suse.com>
- Add 7657-run-tests-aarch64.patch fixing running tests on
aarch64 (gh#neovim/neovim#7423).
-------------------------------------------------------------------
Tue Apr 19 07:17:41 UTC 2022 - Matej Cepl <mcepl@suse.com>

9
neovim.spec
View File

@ -44,6 +44,9 @@ Source99: neovim-rpmlintrc
Patch0: neovim.patch
# PATCH-FIX-OPENSUSE neovim-0.1.7-bitop.patch mcepl@cepl.eu build with old Lua with external bit module
Patch1: neovim-0.1.7-bitop.patch
# PATCH-FIX-UPSTREAM 7657-run-tests-aarch64.patch gh#neovim/neovim#7423 mcepl@suse.com
# fix running tests on aarch64
Patch2: 7657-run-tests-aarch64.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@ -117,11 +120,7 @@ parts of Vim, without compromise, and more.
%define vimplugin_dir %{_datadir}/vim/site
%prep
%setup -q
%patch0 -p1
# %%if %%{without luajit}
%patch1 -p1
# %%endif
%autosetup -p1
install -p -m 0755 %{SOURCE10} .