diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-06 12:39:55 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-06 12:39:55 +0200 |
| commit | 4a5711b5ea54525a262a57ec0d418f76504bad46 (patch) | |
| tree | a06a21d30a78b4029e8b0cd77e3565afbdf689d7 | |
| parent | 543c9b1921d7605498b54afdef518e312f1b4515 (diff) | |
patch 8.1.1121: test for term_gettitle() was disabledv8.1.1121
Problem: Test for term_gettitle() was disabled.
Solution: Enable the test and bail out only when it doesn't work. (Dominique
Pelle, closes #3776)
| -rw-r--r-- | src/testdir/test_terminal.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index be44c14eaf..cae5439b6a 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1842,17 +1842,15 @@ func Test_terminal_no_job() endfunc func Test_term_gettitle() - if !has('title') || empty(&t_ts) - return - endif - " TODO: this fails on Travis - return - " term_gettitle() returns an empty string for a non-terminal buffer - " or for a non-existing buffer. + " and for a non-existing buffer. call assert_equal('', term_gettitle(bufnr('%'))) call assert_equal('', term_gettitle(bufnr('$') + 1)) + if !has('title') || &title == 0 || empty(&t_ts) + throw "Skipped: can't get/set title" + endif + let term = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile']) call WaitForAssert({-> assert_equal('[No Name] - VIM', term_gettitle(term)) }) diff --git a/src/version.c b/src/version.c index b3d7abc74c..1563e6384d 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1121, +/**/ 1120, /**/ 1119, |