Vim developers, Using Make_ming.mak, the "tinytests" collection of build tests will fail if the associated .ok file has Windows line endings. This happens because the test.out file is explicitly set to have unix/linux line endings but the .ok file has not been converted and so "diff" concludes they're different. I have attached a patch which converts the .ok file and cleans-up.
This was introduced by patch v8.2.1439 which removed the "fixff" target. I noticed it because I use git-for-windows and its default is to use Windows line endings in the workspace. I suspect the same problem occurs in Make_dos.mak but I have no way of verifying that. -mike -- -- 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]. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/40e2f8cb-7732-4929-99a7-5e2b94c84e38o%40googlegroups.com.
>From 4c6609b4f1b2158e8e23515a7f0c897bfbf77846 Mon Sep 17 00:00:00 2001 From: msoyka-of-wharton <[email protected]> Date: Tue, 15 Sep 2020 21:37:14 -0400 Subject: [PATCH] fix ff for tinytests --- src/testdir/Make_ming.mak | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak index 5e17963c5..1e7190ad9 100644 --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -103,6 +103,7 @@ $(DOSTMP)/%.in : %.in %.out : $(DOSTMP)/%.in -@if exist test.out $(DEL) test.out -@if exist $(DOSTMP)\$@ $(DEL) $(DOSTMP)\$@ + -@if exist $(DOSTMP)\test.ok $(DEL) $(DOSTMP)\test.ok $(MV) $(notdir $<) $(notdir $<).bak > NUL $(CP) $(DOSTMP)\$(notdir $<) $(notdir $<) > NUL $(CP) $(basename $@).ok test.ok > NUL @@ -117,7 +118,9 @@ $(DOSTMP)/%.in : %.in -@if exist viminfo del viminfo $(VIMPROG) -u dos.vim $(NO_INITS) "+set ff=unix|f test.out|wq" \ $(DOSTMP)\$@ - @diff test.out $(basename $@).ok & if errorlevel 1 \ + $(VIMPROG) -u dos.vim $(NO_INITS) "+set ff=unix|f $(DOSTMP)\test.ok|wq" \ + $(basename $@).ok + @diff test.out $(DOSTMP)\test.ok & if errorlevel 1 \ ( $(MV) test.out $(basename $@).failed > NUL \ & del $(DOSTMP)\$@ \ & echo $(basename $@) FAILED >> test.log ) \ -- 2.26.2.windows.1
