diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-06-20 21:14:04 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-06-23 23:20:29 -0400 |
| commit | 87d6b1eccb8a6fea864008c387d3f1b8abf6905a (patch) | |
| tree | ce4a9a5fe70f1def2ac804130ba2ae97f41e51f2 | |
| parent | d4de2cd7c73d2ab3ebe0e914ac3d223de9703c1e (diff) | |
| download | rneovim-87d6b1eccb8a6fea864008c387d3f1b8abf6905a.tar.gz rneovim-87d6b1eccb8a6fea864008c387d3f1b8abf6905a.tar.bz2 rneovim-87d6b1eccb8a6fea864008c387d3f1b8abf6905a.zip | |
vim-patch:8.1.0347: some tests fail on Solaris
Problem: Some tests fail on Solaris.
Solution: Skip writefile test. Fix path to libc.so. Improve test for Turkish
case change. (Libor Bukata, Bjorn Linse, closes vim/vim#3403)
https://github.com/vim/vim/commit/f1c118be93184e8e57e3e80b1b3383f464ed649e
| -rw-r--r-- | src/nvim/testdir/test_functions.vim | 12 | ||||
| -rw-r--r-- | src/nvim/testdir/test_writefile.vim | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_functions.vim b/src/nvim/testdir/test_functions.vim index acfd4891df..0c3c356622 100644 --- a/src/nvim/testdir/test_functions.vim +++ b/src/nvim/testdir/test_functions.vim @@ -1,4 +1,5 @@ " Tests for various functions. +source shared.vim " Must be done first, since the alternate buffer must be unset. func Test_00_bufexists() @@ -1150,6 +1151,17 @@ func Test_libcall_libcallnr() let libc = 'msvcrt.dll' elseif has('mac') let libc = 'libSystem.B.dylib' + elseif system('uname -s') =~ 'SunOS' + " Set the path to libc.so according to the architecture. + let test_bits = system('file ' . GetVimProg()) + let test_arch = system('uname -p') + if test_bits =~ '64-bit' && test_arch =~ 'sparc' + let libc = '/usr/lib/sparcv9/libc.so' + elseif test_bits =~ '64-bit' && test_arch =~ 'i386' + let libc = '/usr/lib/amd64/libc.so' + else + let libc = '/usr/lib/libc.so' + endif else " On Unix, libc.so can be in various places. " Interestingly, using an empty string for the 1st argument of libcall diff --git a/src/nvim/testdir/test_writefile.vim b/src/nvim/testdir/test_writefile.vim index 9da9df2150..6d88c0d8cd 100644 --- a/src/nvim/testdir/test_writefile.vim +++ b/src/nvim/testdir/test_writefile.vim @@ -33,7 +33,7 @@ func Test_writefile_fails_gently() endfunc func Test_writefile_fails_conversion() - if !has('multi_byte') || !has('iconv') + if !has('multi_byte') || !has('iconv') || system('uname -s') =~ 'SunOS' return endif " Without a backup file the write won't happen if there is a conversion |