Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
Vim
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Someone-Else
Vim
Commits
b6e4e4c6
Commit
b6e4e4c6
authored
4 years ago
by
Bram Moolenaar
Browse files
Options
Downloads
Patches
Plain Diff
patch 8.2.1216: startup test fails
Problem: Startup test fails. Solution: Adjust expected values for deleted lines.
parent
e3f915d1
No related branches found
Branches containing commit
Tags
v8.2.1216
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/testdir/test_startup.vim
+3
-3
3 additions, 3 deletions
src/testdir/test_startup.vim
src/version.c
+2
-0
2 additions, 0 deletions
src/version.c
with
5 additions
and
3 deletions
src/testdir/test_startup.vim
+
3
−
3
View file @
b6e4e4c6
...
@@ -299,7 +299,7 @@ func Test_q_arg()
...
@@ -299,7 +299,7 @@ func Test_q_arg()
if
RunVim
([],
after
,
'-q'
)
if
RunVim
([],
after
,
'-q'
)
let
lines
=
readfile
(
'Xtestout'
)
let
lines
=
readfile
(
'Xtestout'
)
call
assert_equal
([
'errors.err'
,
call
assert_equal
([
'errors.err'
,
\
'[0, 208,
5
, 0]'
,
\
'[0, 208,
1
, 0]'
,
\
source_file
.
"|208 col 5| error: expected ';' before '}' token"
],
\
source_file
.
"|208 col 5| error: expected ';' before '}' token"
],
\
lines
)
\
lines
)
endif
endif
...
@@ -311,7 +311,7 @@ func Test_q_arg()
...
@@ -311,7 +311,7 @@ func Test_q_arg()
if
RunVim
([],
after
,
'-q Xerrors'
)
if
RunVim
([],
after
,
'-q Xerrors'
)
let
lines
=
readfile
(
'Xtestout'
)
let
lines
=
readfile
(
'Xtestout'
)
call
assert_equal
([
'Xerrors'
,
call
assert_equal
([
'Xerrors'
,
\
'[0, 208,
5
, 0]'
,
\
'[0, 208,
1
, 0]'
,
\
source_file
.
"|208 col 5| error: expected ';' before '}' token"
],
\
source_file
.
"|208 col 5| error: expected ';' before '}' token"
],
\
lines
)
\
lines
)
endif
endif
...
@@ -321,7 +321,7 @@ func Test_q_arg()
...
@@ -321,7 +321,7 @@ func Test_q_arg()
if
RunVim
([],
after
,
'-qXerrors'
)
if
RunVim
([],
after
,
'-qXerrors'
)
let
lines
=
readfile
(
'Xtestout'
)
let
lines
=
readfile
(
'Xtestout'
)
call
assert_equal
([
'Xerrors'
,
call
assert_equal
([
'Xerrors'
,
\
'[0, 208,
5
, 0]'
,
\
'[0, 208,
1
, 0]'
,
\
source_file
.
"|208 col 5| error: expected ';' before '}' token"
],
\
source_file
.
"|208 col 5| error: expected ';' before '}' token"
],
\
lines
)
\
lines
)
endif
endif
...
...
This diff is collapsed.
Click to expand it.
src/version.c
+
2
−
0
View file @
b6e4e4c6
...
@@ -754,6 +754,8 @@ static char *(features[]) =
...
@@ -754,6 +754,8 @@ static char *(features[]) =
static
int
included_patches
[]
=
static
int
included_patches
[]
=
{
/* Add new patch number below this line */
{
/* Add new patch number below this line */
/**/
1216
,
/**/
/**/
1215
,
1215
,
/**/
/**/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment