Skip to content

Commit 298c659

Browse files
committed
patch 7.4.1698
Problem: Two tests fail when running tests with MinGW. (Michael Soyka) Solution: Convert test_getcwd.ok test_wordcount.ok to unix fileformat.
1 parent cb07008 commit 298c659

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/testdir/Make_ming.mak

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,11 @@ win32: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32)
6565
echo ALL DONE
6666

6767
fixff:
68+
# TODO: find a way to avoid changing the distributed files.
6869
-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=dos|upd" +q *.in *.ok
6970
-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=unix|upd" +q \
70-
dotest.in test60.ok test71.ok test74.ok test_listchars.ok
71+
dotest.in test60.ok test71.ok test74.ok test_listchars.ok \
72+
test_getcwd.ok test_wordcount.ok
7173

7274
clean:
7375
-$(DEL) *.out

src/version.c

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

749749
static int included_patches[] =
750750
{ /* Add new patch number below this line */
751+
/**/
752+
1698,
751753
/**/
752754
1697,
753755
/**/

0 commit comments

Comments
 (0)