summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-20 22:35:02 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-20 22:35:02 +0100
commit85683ec620be199d63af3b0542a03eeb72b08fb6 (patch)
treeeb8d86c4ed0e8b5d5153f1c61aa1506c954e8f28
parente0807ea4a715334bd9a4795d98cad6e7925b5281 (diff)
patch 8.2.0290: running individual test differs from all testsv8.2.0290
Problem: Running individual test differs from all tests. Solution: Pass on environment variables. (Yee Cheng Chin, closes #5672)
-rw-r--r--src/testdir/Makefile2
-rw-r--r--src/testdir/README.txt2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index a0520e0fb4..746c849938 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -73,7 +73,7 @@ $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS_RES): $(SCRIPTS_FIRST)
# make test_largefile
$(NEW_TESTS):
rm -f $@.res test.log messages
- @MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile $@.res
+ @MAKEFLAGS=--no-print-directory $(MAKE) -f Makefile $@.res VIMPROG=$(VIMPROG) XXDPROG=$(XXDPROG) SCRIPTSOURCE=$(SCRIPTSOURCE)
@cat messages
@if test -f test.log; then \
exit 1; \
diff --git a/src/testdir/README.txt b/src/testdir/README.txt
index 76396fee39..d639146761 100644
--- a/src/testdir/README.txt
+++ b/src/testdir/README.txt
@@ -25,6 +25,8 @@ At 2), instead of running the test separately, it can be included in
bit faster, because Vim doesn't have to be started, one Vim instance runs many
tests.
+At 4), to run a test in GUI, add "GUI_FLAG=-g" to the make command.
+
What you can use (see test_assert.vim for an example):
diff --git a/src/version.c b/src/version.c
index 75e02ffb07..58b84d054f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 290,
+/**/
289,
/**/
288,