diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 2e1d900b88..181dee36cb 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -2,6 +2,11 @@ # Makefile to run all tests for Vim # +# The old-style tests (*.in) use shared filenames in the working directory +# (test.ok, test.out, X*, viminfo), so running them in parallel causes races +# and spurious failures. +.NOTPARALLEL: + # Use console or GUI. VIMPROG = ../vim XXDPROG = ../xxd/xxd diff --git a/src/version.c b/src/version.c index c1b9f298a8..a19d721d7d 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 410, /**/ 409, /**/