Skip to content

Commit f60b796

Browse files
committed
patch 7.4.1111
Problem: test_expand fails on MS-Windows. Solution: Always use forward slashes. Remove references to test27.
1 parent 8c60005 commit f60b796

7 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/testdir/Make_all.mak

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ SCRIPTS_MORE2 = \
139139
test10.out \
140140
test12.out \
141141
test25.out \
142-
test27.out \
143142
test49.out \
144143
test97.out
145144

src/testdir/Make_amiga.mak

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ include Make_all.mak
1515
# test11 "cat" doesn't work properly
1616
# test12 can't unlink a swap file
1717
# test25 uses symbolic link
18-
# test27 can't edit file with "*"
1918
# test52 only for Win32
2019
# test85 no Lua interface
2120
# test86, 87 no Python interface

src/testdir/Make_dos.mak

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ default: nongui
1414
# test10 'errorformat' is different
1515
# test12 can't unlink a swap file
1616
# test25 uses symbolic link
17-
# test27 can't edit file with "*" in file name
1817
# test49 fails in various ways
1918
# test97 \{ and \$ are not escaped characters.
2019

src/testdir/Make_ming.mak

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ include Make_all.mak
3535
# test10 'errorformat' is different
3636
# test12 can't unlink a swap file
3737
# test25 uses symbolic link
38-
# test27 can't edit file with "*" in file name
3938
# test54 doesn't work yet
4039
# test97 \{ and \$ are not escaped characters
4140

src/testdir/runtest.vim

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ set nomore
4343
" Output all messages in English.
4444
lang mess C
4545

46+
" Always use forward slashes.
47+
set shellslash
48+
4649
let s:srcdir = expand('%:p:h:h')
4750

4851
" Support function: get the alloc ID by name.

src/testdir/test_expand.vim

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ func Test_with_directories()
1616

1717
next Xdir?/*/file
1818
call assert_equal('Xdir3/Xdir4/file', expand('%'))
19-
next! Xdir?/*/nofile
20-
call assert_equal('Xdir?/*/nofile', expand('%'))
19+
if has('unix')
20+
next! Xdir?/*/nofile
21+
call assert_equal('Xdir?/*/nofile', expand('%'))
22+
endif
2123

2224
call delete('Xdir1', 'rf')
2325
call delete('Xdir2', 'rf')

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
1111,
744746
/**/
745747
1110,
746748
/**/

0 commit comments

Comments
 (0)