commit 5ff7df509ad6bde89991d38d87a6fc796b862ba7
author Bram Moolenaar <Bram@vim.org> Fri Feb 15 01:06:13 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Fri Feb 15 01:06:13 2019 +0100
tree 4b8a7163f93b598994950c5cbe895f8729fd14d3
parent 7e841e3ce507d3c03175213d167692609028fdd9

patch 8.1.0925: terminal scrollback test still still flaky

Problem:    Terminal scrollback test still still flaky.
Solution:   Explicitly set the shell.  Disable ruler. (Ozaki Kiichi,
            closes #3966)

src/testdir/dumps/Test_terminal_01.dump

diff --git a/src/testdir/dumps/Test_terminal_01.dump b/src/testdir/dumps/Test_terminal_01.dump
index 4a0014f..a242bb7 100644
--- a/src/testdir/dumps/Test_terminal_01.dump
+++ b/src/testdir/dumps/Test_terminal_01.dump
@@ -7,7 +7,7 @@
 |4|8| @72
 >4|9| @72
 |~+0#4040ff13&| @73
-|!+2#ffffff16#00e0003|/|b|i|n|/|t|c|s|h| |[|T|e|r|m|i|n|a|l|]| @35|5|1|,|1| @10|B|o|t
+|!+2#ffffff16#00e0003|/|b|i|n|/|s|h| |[|T|e|r|m|i|n|a|l|]| @55
 | +0#0000000#ffffff0@74
 |~+0#4040ff13&| @73
 |~| @73
@@ -16,5 +16,5 @@
 |~| @73
 |~| @73
 |~| @73
-|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+|[+1#0000000&|N|o| |N|a|m|e|]| @65
 | +0&&@74

src/testdir/dumps/Test_terminal_02.dump

diff --git a/src/testdir/dumps/Test_terminal_02.dump b/src/testdir/dumps/Test_terminal_02.dump
index b9dfdbe..427a9ad 100644
--- a/src/testdir/dumps/Test_terminal_02.dump
+++ b/src/testdir/dumps/Test_terminal_02.dump
@@ -7,7 +7,7 @@
 >4|8| @72
 |4|9| @72
 |~+0#4040ff13&| @73
-|!+2#ffffff16#00e0003|/|b|i|n|/|t|c|s|h| |[|T|e|r|m|i|n|a|l|]| @35|5|0|,|1| @10|B|o|t
+|!+2#ffffff16#00e0003|/|b|i|n|/|s|h| |[|T|e|r|m|i|n|a|l|]| @55
 | +0#0000000#ffffff0@74
 |~+0#4040ff13&| @73
 |~| @73
@@ -16,5 +16,5 @@
 |~| @73
 |~| @73
 |~| @73
-|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+|[+1#0000000&|N|o| |N|a|m|e|]| @65
 | +0&&@74

src/testdir/dumps/Test_terminal_03.dump

diff --git a/src/testdir/dumps/Test_terminal_03.dump b/src/testdir/dumps/Test_terminal_03.dump
index 6bc6ee7..0796088 100644
--- a/src/testdir/dumps/Test_terminal_03.dump
+++ b/src/testdir/dumps/Test_terminal_03.dump
@@ -7,7 +7,7 @@
 |4|9| @72
 |o|n|e| |m|o|r|e| |l|i|n|e| @61
 > @74
-|!+2#ffffff16#00e0003|/|b|i|n|/|t|c|s|h| |[|r|u|n@1|i|n|g|]| @36|4|3|,|1| @10|B|o|t
+|!+2#ffffff16#00e0003|/|b|i|n|/|s|h| |[|r|u|n@1|i|n|g|]| @56
 | +0#0000000#ffffff0@74
 |~+0#4040ff13&| @73
 |~| @73
@@ -16,5 +16,5 @@
 |~| @73
 |~| @73
 |~| @73
-|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+|[+1#0000000&|N|o| |N|a|m|e|]| @65
 | +0&&@74