test/old/testdir/test_stat.vim | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 skip flaky tests in test_stat.vim

Test_checktime and Test_autoread_file_deleted are particularly flaky on s390x, so skip them to avoid the noise.

test/unit/testutil.lua | 7 7 + 0 - 0 !
1 file changed, 7 insertions(+)

 fix(tests): ignore vector math types

As noted in #34908, the arm unittests fail due to unrecognized types:

    ERROR    test/unit/testutil.lua @ 802: Expressions parser works with &opt
    test/unit/testutil.lua:774: test/unit/testutil.lua:758: (string) '
    test/unit/testutil.lua:288: declaration specifier expected near '__SVFloat32_t''
    exit code: 256

After testing on Debian's arm64 porterbox, the unittests cleanly pass
when ignoring various types defined in
/usr/include/aarch64-linux-gnu/bits/math-vector.h

(cherry picked from commit e702f97518cd18fa57c50ee62fdc63ad887f006d)

src/cjson/lua_cjson.c | 10 9 + 1 - 0 !
1 file changed, 9 insertions(+), 1 deletion(-)

 fix(vim.json): fix truncation of decoded numbers outside
 lua_Integer's range #35702

PR #34876 expanded the total range of values that cjson considers
valid. However, it didn't address the bigger problem of storing a
`long long` value in a `lua_Integer` (which is typically a typedef for

test/functional/ex_cmds/swapfile_preserve_recover_spec.lua | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 test(swapfile_preserve_recover_spec): fix flaky test (#35782)

Invoke nvim_get_mode() to ensure that pending input is processed.

(cherry picked from commit 1bafba31f6a6d8cd367e1388e22013f3f7d0331e)
(cherry picked from commit 777551c599aeee49c4936034163be5ae3048e5ae)
Signed-off-by: James McCoy <jamessan@debian.org>