Mercurial > vim
view src/testdir/Make_ming.mak @ 34379:37b4c89ba420 v9.1.0116
patch 9.1.0116: win_split_ins may not check available room
Commit: https://github.com/vim/vim/commit/0fd44a5ad81ade342cb54d8984965bdedd2272c8
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Feb 20 20:28:15 2024 +0100
patch 9.1.0116: win_split_ins may not check available room
Problem: win_split_ins has no check for E36 when moving an existing
window
Solution: check for room and fix the issues in f_win_splitmove()
(Sean Dewar)
win_split_ins has no check for E36 when moving an existing window,
allowing for layouts with many overlapping zero-sized windows to be
created (which may also cause drawing issues with tablines and such).
f_win_splitmove also has some bugs.
So check for room and fix the issues in f_win_splitmove. Handle failure
in the two relevant win_split_ins callers by restoring the original
layout, and factor the common logic into win_splitmove.
Don't check for room when opening an autocommand window, as it's a
temporary window that's rarely interacted with or drawn anyhow, and is
rather important for some autocommands.
Issues fixed in f_win_splitmove:
- Error if splitting is disallowed.
- Fix heap-use-after-frees if autocommands fired from switching to "targetwin"
close "wp" or "oldwin".
- Fix splitting the wrong window if autocommands fired from switching to
"targetwin" switch to a different window.
- Ensure -1 is returned for all errors.
Also handle allocation failure a bit earlier in make_snapshot (callers,
except win_splitmove, don't really care if a snapshot can't be made, so
just ignore the return value).
Note: Test_smoothscroll_in_zero_width_window failed after these changes with
E36, as it was using the previous behaviour to create a zero-width window.
I've fixed the test such that it fails with UBSAN as expected when v9.0.1367 is
reverted (and simplified it too).
related: #14042
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 20 Feb 2024 22:30:04 +0100 |
parents | 55aa44dd59ef |
children |
line wrap: on
line source
# # Makefile to run all tests for Vim, on Dos-like machines # with sh.exe or zsh.exe in the path or not. # # Author: Bill McCarthy # # Requires a set of Unix tools: echo, diff, etc. # Don't use unix-like shell. SHELL = cmd.exe DEL = del DELDIR = rd /s /q MV = move /y CP = copy /y CAT = type VIMPROG = ..\\vim default: nongui include Make_all.mak # Explicit dependencies. test_options.res test_alot.res: opt_test.vim TEST_OUTFILES = $(SCRIPTS_TINY_OUT) DOSTMP = dostmp # Keep $(DOSTMP)/*.in .PRECIOUS: $(patsubst %.out, $(DOSTMP)/%.in, $(TEST_OUTFILES)) .SUFFIXES: .in .out .res .vim # Add --gui-dialog-file to avoid getting stuck in a dialog. COMMON_ARGS = $(NO_INITS) --gui-dialog-file guidialog nongui: nolog tinytests newtests report gui: nolog tinytests newtests report tiny: nolog tinytests report benchmark: $(SCRIPTS_BENCH) report: @rem without the +eval feature test_result.log is a copy of test.log @if exist test.log ( copy /y test.log test_result.log > nul ) \ else ( echo No failures reported > test_result.log ) $(VIMPROG) -u NONE $(COMMON_ARGS) -S summarize.vim messages -if exist starttime del starttime @echo. @echo Test results: @cmd /c type test_result.log @if exist test.log ( echo TEST FAILURE & exit /b 1 ) \ else ( echo ALL DONE ) # Execute an individual new style test, e.g.: # mingw32-make -f Make_ming.mak test_largefile $(NEW_TESTS): -if exist $@.res del $@.res -if exist test.log del test.log -if exist messages del messages -if exist starttime del starttime @$(MAKE) -f Make_ming.mak $@.res VIMPROG=$(VIMPROG) --no-print-directory @type messages @if exist test.log exit 1 # Delete files that may interfere with running tests. This includes some files # that may result from working on the tests, not only from running them. clean: -@if exist *.out $(DEL) *.out -@if exist *.failed $(DEL) *.failed -@if exist *.res $(DEL) *.res -@if exist $(DOSTMP) rd /s /q $(DOSTMP) -@if exist test.in $(DEL) test.in -@if exist test.ok $(DEL) test.ok -@if exist Xdir1 $(DELDIR) Xdir1 -@if exist Xfind $(DELDIR) Xfind -@if exist XfakeHOME $(DELDIR) XfakeHOME -@if exist X* $(DEL) X* -@for /d %%i in (X*) do @rd /s/q %%i -@if exist viminfo $(DEL) viminfo -@if exist test.log $(DEL) test.log -@if exist test_result.log del test_result.log -@if exist messages $(DEL) messages -@if exist starttime $(DEL) starttime -@if exist benchmark.out del benchmark.out -@if exist opt_test.vim $(DEL) opt_test.vim -@if exist guidialog $(DEL) guidialog -@if exist guidialogfile $(DEL) guidialogfile nolog: -@if exist test.log $(DEL) test.log -@if exist test_result.log del test_result.log -@if exist messages $(DEL) messages -@if exist starttime $(DEL) starttime # Tiny tests. Works even without the +eval feature. tinytests: $(SCRIPTS_TINY_OUT) # Copy the input files to dostmp, changing the fileformat to dos. $(DOSTMP)/%.in : %.in if not exist $(DOSTMP)\nul mkdir $(DOSTMP) if exist $(DOSTMP)\$< $(DEL) $(DOSTMP)\$< $(VIMPROG) -u dos.vim $(COMMON_ARGS) "+set ff=dos|f $@|wq" $< # For each input file dostmp/test99.in run the tests. # This moves test99.in to test99.in.bak temporarily. %.out : $(DOSTMP)/%.in -@if exist test.out $(DEL) test.out -@if exist $(DOSTMP)\$@ $(DEL) $(DOSTMP)\$@ $(MV) $(notdir $<) $(notdir $<).bak > NUL $(CP) $(DOSTMP)\$(notdir $<) $(notdir $<) > NUL $(CP) $(basename $@).ok test.ok > NUL $(VIMPROG) -u dos.vim $(COMMON_ARGS) -s dotest.in $(notdir $<) -@if exist test.out $(MV) test.out $(DOSTMP)\$@ > NUL -@if exist $(notdir $<).bak $(MV) $(notdir $<).bak $(notdir $<) > NUL -@if exist test.ok $(DEL) test.ok -@if exist Xdir1 $(DELDIR) /s /q Xdir1 -@if exist Xfind $(DELDIR) Xfind -@if exist XfakeHOME $(DELDIR) XfakeHOME -@del X* -@if exist viminfo del viminfo $(VIMPROG) -u dos.vim $(COMMON_ARGS) "+set ff=unix|f test.out|wq" \ $(DOSTMP)\$@ @diff test.out $(basename $@).ok & if errorlevel 1 \ ( $(MV) test.out $(basename $@).failed > NUL \ & del $(DOSTMP)\$@ \ & echo $(basename $@) FAILED >> test.log ) \ else ( $(MV) test.out $(basename $@).out > NUL ) # New style of tests uses Vim script with assert calls. These are easier # to write and a lot easier to read and debug. # Limitation: Only works with the +eval feature. newtests: newtestssilent @if exist messages type messages newtestssilent: $(NEW_TESTS_RES) .vim.res: @echo $(VIMPROG) > vimcmd $(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $*.vim @$(DEL) vimcmd test_gui.res: test_gui.vim @echo $(VIMPROG) > vimcmd $(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $< @$(DEL) vimcmd test_gui_init.res: test_gui_init.vim @echo $(VIMPROG) > vimcmd $(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @$(DEL) vimcmd opt_test.vim: ../optiondefs.h gen_opt_test.vim $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h test_bench_regexp.res: test_bench_regexp.vim -$(DEL) benchmark.out @echo $(VIMPROG) > vimcmd $(VIMPROG) -u NONE $(COMMON_ARGS) -S runtest.vim $*.vim @$(DEL) vimcmd $(CAT) benchmark.out