diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-01-16 22:47:23 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-01-16 22:47:23 +0100 |
commit | f60b796fa9870bdfc4cdeb91653bac041916077d (patch) | |
tree | d44c612998b14cadd0702018a01cdb9afdc65b77 /src/testdir | |
parent | 8c600052fabe4859470d9d0ba2ddd74a52ea9745 (diff) |
patch 7.4.1111v7.4.1111
Problem: test_expand fails on MS-Windows.
Solution: Always use forward slashes. Remove references to test27.
Diffstat (limited to 'src/testdir')
-rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
-rw-r--r-- | src/testdir/Make_amiga.mak | 1 | ||||
-rw-r--r-- | src/testdir/Make_dos.mak | 1 | ||||
-rw-r--r-- | src/testdir/Make_ming.mak | 1 | ||||
-rw-r--r-- | src/testdir/runtest.vim | 3 | ||||
-rw-r--r-- | src/testdir/test_expand.vim | 6 |
6 files changed, 7 insertions, 6 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index 33fc3451b7..81e196c1df 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -139,7 +139,6 @@ SCRIPTS_MORE2 = \ test10.out \ test12.out \ test25.out \ - test27.out \ test49.out \ test97.out diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak index c39e450d5c..cea4699cad 100644 --- a/src/testdir/Make_amiga.mak +++ b/src/testdir/Make_amiga.mak @@ -15,7 +15,6 @@ include Make_all.mak # test11 "cat" doesn't work properly # test12 can't unlink a swap file # test25 uses symbolic link -# test27 can't edit file with "*" # test52 only for Win32 # test85 no Lua interface # test86, 87 no Python interface diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index f6e45d83eb..47f9d22230 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -14,7 +14,6 @@ default: nongui # test10 'errorformat' is different # test12 can't unlink a swap file # test25 uses symbolic link -# test27 can't edit file with "*" in file name # test49 fails in various ways # test97 \{ and \$ are not escaped characters. diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak index 88e72b15e2..b4ebaebe91 100644 --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -35,7 +35,6 @@ include Make_all.mak # test10 'errorformat' is different # test12 can't unlink a swap file # test25 uses symbolic link -# test27 can't edit file with "*" in file name # test54 doesn't work yet # test97 \{ and \$ are not escaped characters diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index fd64c98fc3..2a9231abcc 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -43,6 +43,9 @@ set nomore " Output all messages in English. lang mess C +" Always use forward slashes. +set shellslash + let s:srcdir = expand('%:p:h:h') " Support function: get the alloc ID by name. diff --git a/src/testdir/test_expand.vim b/src/testdir/test_expand.vim index fd999db1b7..a68c4226f0 100644 --- a/src/testdir/test_expand.vim +++ b/src/testdir/test_expand.vim @@ -16,8 +16,10 @@ func Test_with_directories() next Xdir?/*/file call assert_equal('Xdir3/Xdir4/file', expand('%')) - next! Xdir?/*/nofile - call assert_equal('Xdir?/*/nofile', expand('%')) + if has('unix') + next! Xdir?/*/nofile + call assert_equal('Xdir?/*/nofile', expand('%')) + endif call delete('Xdir1', 'rf') call delete('Xdir2', 'rf') |