diff options
| author | Yee Cheng Chin <ychin.git@gmail.com> | 2022-11-06 12:25:47 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-11-06 12:25:47 +0000 |
| commit | 69a8bb8dc13571102537762b047747cc36b53d5d (patch) | |
| tree | 41d64b164ec7dce2b1f5d4735eb30a8b968ed911 | |
| parent | a25f718431ae001242a6a8b74733ee7685ccf07d (diff) | |
patch 9.0.0839: test may fail depending on sequence of eventsv9.0.0839
Problem: Test may fail depending on sequence of events.
Solution: Accept error codes in either order. (Yee Cheng Chin,
closes #11510)
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index ac865129f6..b6e1a89d24 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -4087,7 +4087,8 @@ def Test_no_unknown_error_after_error() endfor END writefile(lines, 'Xdef', 'D') - assert_fails('so Xdef', ['E684:', 'E1012:']) + # Either the exit or out callback is called first, accept them in any order + assert_fails('so Xdef', ['E684:\|E1012:', 'E1012:\|E684:']) enddef def InvokeNormal() diff --git a/src/version.c b/src/version.c index 6aef2c1319..c454557cde 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 839, +/**/ 838, /**/ 837, |