patch 8.1.1048: minor issues with tests

Problem:    Minor issues with tests.
Solution:   Delete unused test OK file.  Add missing entries in list of tests.
            Fix readme file. (Masato Nishihata, closes #4160)

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 8581700adc0fd88f1dc6b2542ab7b04c6f64b8da..81d0dc7f0a8f459e4250f3ea458cfc288bacc407 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -224,6 +224,7 @@ NEW_TESTS = \
        test_searchpos \
        test_set \
        test_sha256 \
+       test_shortpathname \
        test_signals \
        test_signs \
        test_smartindent \
@@ -258,6 +259,7 @@ NEW_TESTS = \
        test_true_false \
        test_undo \
        test_unlet \
+       test_user_func \
        test_usercommands \
        test_utf8 \
        test_utf8_comparisons \

diff --git a/src/testdir/README.txt b/src/testdir/README.txt
index f4486e302b8866aa3feaabae8d0dbe6877e74376..76396fee3952cc93215de2210cf6ec2c727bc30f 100644 (file)
--- a/src/testdir/README.txt
+++ b/src/testdir/README.txt
@@ -34,17 +34,14 @@ What you can use (see test_assert.vim for an example):
 
 - Use try/catch to avoid an exception aborts the test.
 
-- Use alloc_fail() to have memory allocation fail. This makes it possible to
-  check memory allocation failures are handled gracefully.  You need to change
-
-- the source code to add an ID to the allocation.  Update LAST_ID_USED above
-  alloc_id() to the highest ID used.
+- Use test_alloc_fail() to have memory allocation fail.  This makes it possible
+  to check memory allocation failures are handled gracefully.  You need to
+  change the source code to add an ID to the allocation.  Add a new one to
+  alloc_id_T, before aid_last.
 
 - Use test_override() to make Vim behave differently, e.g.  if char_avail()
   must return FALSE for a while.  E.g. to trigger the CursorMovedI autocommand
-  event.
-
-- See test_cursor_func.vim for an example.
+  event. See test_cursor_func.vim for an example.
 
 - If the bug that is being tested isn't fixed yet, you can throw an exception
   with "Skipped" so that it's clear this still needs work.  E.g.: throw
@@ -64,7 +61,7 @@ TO ADD AN OLD STYLE TEST:
 1) Create test_<subject>.in and test_<subject>.ok files.
 2) Add test_<subject>.out to SCRIPTS_ALL in Make_all.mak in alphabetical order.
 3) Use make test_<subject>.out to run a single test in src/testdir/.
-   Use make test_<subject>  to run a single test in src/.
+   Use make test_<subject> to run a single test in src/.
 4) Also add an entry in src/Makefile.
 
 Keep in mind that the files are used as if everything was typed:

diff --git a/src/testdir/test85.ok b/src/testdir/test85.ok
deleted file mode 100644 (file)
index 4753483..0000000
--- a/src/testdir/test85.ok
+++ /dev/null
@@ -1,7 +0,0 @@
-1 changed line 1
-scalar test OK
-2 line 2
-dictionary with list OK
-circular test OK
-[123.0, 'abc', [1, 2, 3], {'a': 1, 'b': 2, 'c': 3}]
-{'4': 123.0, '5': 'abc', '6': [1, 2, 3], '7': {'a': 1, 'b': 2, 'c': 3}}

diff --git a/src/version.c b/src/version.c
index cb044bc7238051f97a615ac4c946684bb9c365a0..d5e8c8b591abc7db95f5cd1ba159a215cb5b7c22 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -775,6 +775,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1048,
 /**/
     1047,
 /**/