Mercurial > vim
changeset 22774:8561ae67f85d v8.2.1935
patch 8.2.1935: sort test fails on Mac
Commit: https://github.com/vim/vim/commit/578f4cc7d0ce67101832b25cf77246fcd630e3c0
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 1 17:19:07 2020 +0100
patch 8.2.1935: sort test fails on Mac
Problem: Sort test fails on Mac.
Solution: Disable the sort test with locale on Mac.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 01 Nov 2020 17:30:03 +0100 |
| parents | 29dfa14e14e1 |
| children | a3e03821096a |
| files | src/testdir/test_sort.vim src/version.c |
| diffstat | 2 files changed, 19 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_sort.vim +++ b/src/testdir/test_sort.vim @@ -22,17 +22,20 @@ func Test_sort_strings() call assert_equal(['A', 'a', 'o', 'O', 'p', 'P', 'Ä', 'Ô', 'ä', 'ô', 'œ', 'œ'], \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'i')) - let lc = execute('language collate') - " With the following locales, the accentuated letters are ordered - " similarly to the non-accentuated letters... - if lc =~? '"\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8"' - call assert_equal(['a', 'A', 'ä', 'Ä', 'o', 'O', 'ô', 'Ô', 'œ', 'œ', 'p', 'P'], - \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l')) - " ... whereas with a Swedish locale, the accentuated letters are ordered - " after Z. - elseif lc =~? '"sv.*utf-\?8"' - call assert_equal(['a', 'A', 'o', 'O', 'p', 'P', 'ä', 'Ä', 'œ', 'œ', 'ô', 'Ô'], - \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l')) + " This does not appear to work correctly on Mac. + if !has('mac') + let lc = execute('language collate') + " With the following locales, the accentuated letters are ordered + " similarly to the non-accentuated letters... + if lc =~? '"\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8"' + call assert_equal(['a', 'A', 'ä', 'Ä', 'o', 'O', 'ô', 'Ô', 'œ', 'œ', 'p', 'P'], + \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l')) + " ... whereas with a Swedish locale, the accentuated letters are ordered + " after Z. + elseif lc =~? '"sv.*utf-\?8"' + call assert_equal(['a', 'A', 'o', 'O', 'p', 'P', 'ä', 'Ä', 'œ', 'œ', 'ô', 'Ô'], + \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l')) + endif endif endfunc @@ -1224,9 +1227,10 @@ func Test_sort_cmd() \ ] " With the following locales, the accentuated letters are ordered - " similarly to the non-accentuated letters... + " similarly to the non-accentuated letters. + " This does not appear to work on Mac let lc = execute('language collate') - if lc =~? '"\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8"' + if lc =~? '"\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8"' && !has('mac') let tests += [ \ { \ 'name' : 'sort with locale',