On So, 29 Nov 2015, Bram Moolenaar wrote:
> Michael Soyka wrote:
>
> > As of patch 942, the build-test "listchars" fails under Windows when
> > using the mingw compiler. Specifically, the command "diff test.out
> > test_listchars.ok" fails because test.out file is in unix format and
> > test_listchars.ok" is in DOS format.
> >
> > As I see it, there are two ways to fix this:
> >
> > 1. Modify src/testdir/Make_ming.mak to convert test_listchars.ok from
> > DOS to unix format (fixff target in makefile) or
So does this fixes it?
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -120,7 +120,7 @@ win32: fixff $(SCRIPTS16) $(SCRIPTS) $(S
fixff:
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
- dotest.in test60.ok test71.ok test74.ok
+ dotest.in test60.ok test71.ok test74.ok test_listchars.ok
clean:
-$(DEL) *.out
> > 2. change the "set ff" statement in test_listchars.in" to specify "dos"
> > instead of unix".
> >
> > Of these, changing the makefile will affect only mingw build
> > environments and so I prefer number one.
>
> This test changed in patch 7.4.733. Christian, setting 'fileformat' to
> unix has problems, is there another solution for the problem this patch
> was fixing? Perhaps fileformat can be reset before writing to test.out?
Yes that was done, because of a failure in the Windows test:
https://ci.appveyor.com/project/k-takata/vim-ci/build/288#L1693
That patch fixed the error for the other windows built, but apparently
broke it for mingw. So I would go with the patch above, if it can be
confirmed to work correctly.
Best,
Christian
--
Weg mit der Schwerkraft! Es lebe der Leichtsinn!
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
