diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-05-18 21:12:59 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-05-18 21:12:59 +0200 |
commit | d098b824c10cc20dc55e18c22c4991f61826006e (patch) | |
tree | 520ef6ef172dcee3b84a08f4f07d86e2063589b8 /src/libvterm/t | |
parent | 1e1d2e89fa460328883bb09fb13a24e26ef1ab31 (diff) | |
download | vim-git-d098b824c10cc20dc55e18c22c4991f61826006e.tar.gz |
patch 8.2.0794: libvterm code lags behind the upstream versionv8.2.0794
Problem: Libvterm code lags behind the upstream version.
Solution: Include revisions 743 - 747.
Diffstat (limited to 'src/libvterm/t')
-rw-r--r-- | src/libvterm/t/67screen_dbl_wh.test | 6 | ||||
-rw-r--r-- | src/libvterm/t/run-test.pl | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/libvterm/t/67screen_dbl_wh.test b/src/libvterm/t/67screen_dbl_wh.test index 7d17d9a8c..9c81e83b8 100644 --- a/src/libvterm/t/67screen_dbl_wh.test +++ b/src/libvterm/t/67screen_dbl_wh.test @@ -30,3 +30,9 @@ PUSH "abcde" ?screen_cell 0,0 = {0x61} width=1 attrs={} fg=rgb(240,240,240) bg=rgb(0,0,0) PUSH "\e#6" ?screen_cell 0,0 = {0x61} width=1 attrs={} dwl fg=rgb(240,240,240) bg=rgb(0,0,0) + +!DWL doesn't spill over on scroll +RESET +PUSH "\e[25H\e#6Final\r\n" + ?screen_cell 23,0 = {0x46} width=1 attrs={} dwl fg=rgb(240,240,240) bg=rgb(0,0,0) + ?screen_cell 24,0 = {} width=1 attrs={} fg=rgb(240,240,240) bg=rgb(0,0,0) diff --git a/src/libvterm/t/run-test.pl b/src/libvterm/t/run-test.pl index d8fbe09ed..a6de7a27d 100644 --- a/src/libvterm/t/run-test.pl +++ b/src/libvterm/t/run-test.pl @@ -140,14 +140,14 @@ sub do_line } } # Assertions start with '?' - elsif( $line =~ s/^\?([a-z]+.*?=)\s+// ) { + elsif( $line =~ s/^\?([a-z]+.*?=)\s*// ) { do_onetest if defined $command; my ( $assertion ) = $1 =~ m/^(.*)\s+=/; $hin->print( "\?$assertion\n" ); my $response = <$hout>; defined $response or wait, die "Test harness failed - $?\n"; - chomp $response; + chomp $response; $response =~ s/^\s+|\s+$//g; if( $response ne $line ) { print "# Assert $assertion failed:\n" . |