diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-09-01 22:56:41 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-01 22:56:41 -0700 |
commit | 099445cc07b0154edc6ecd562a28e86c87c0096b (patch) | |
tree | bb539bd3877fc0545b1c7db13039b357477e5758 /test/functional/terminal | |
parent | 7bb029eeef65f57d94cef4e4b709e6c3ebefcf08 (diff) | |
parent | ead39d6ce6d1c5e5b6130c6823d071889c207bde (diff) | |
download | rneovim-099445cc07b0154edc6ecd562a28e86c87c0096b.tar.gz rneovim-099445cc07b0154edc6ecd562a28e86c87c0096b.tar.bz2 rneovim-099445cc07b0154edc6ecd562a28e86c87c0096b.zip |
Merge #10804 'CI/OpenBSD: functional tests'
Diffstat (limited to 'test/functional/terminal')
-rw-r--r-- | test/functional/terminal/scrollback_spec.lua | 6 | ||||
-rw-r--r-- | test/functional/terminal/tui_spec.lua | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua index 544325e746..065cb98e69 100644 --- a/test/functional/terminal/scrollback_spec.lua +++ b/test/functional/terminal/scrollback_spec.lua @@ -406,7 +406,7 @@ describe("'scrollback' option", function() if iswin() then feed_data('for /L %I in (1,1,30) do @(echo line%I)\r') else - feed_data('for i in $(seq 1 30); do echo "line$i"; done\n') + feed_data('awk "BEGIN{for(n=1;n<=30;n++) print \\\"line\\\" n}"\n') end screen:expect{any='line30 '} retry(nil, nil, function() expect_lines(7) end) @@ -431,7 +431,7 @@ describe("'scrollback' option", function() if iswin() then feed_data('for /L %I in (1,1,30) do @(echo line%I)\r') else - feed_data('for i in $(seq 1 30); do echo "line$i"; done\n') + feed_data('awk "BEGIN{for(n=1;n<=30;n++) print \\\"line\\\" n}"\n') end screen:expect{any='line30 '} @@ -448,7 +448,7 @@ describe("'scrollback' option", function() if iswin() then feed_data('for /L %I in (1,1,40) do @(echo line%I)\r') else - feed_data('for i in $(seq 1 40); do echo "line$i"; done\n') + feed_data('awk "BEGIN{for(n=1;n<=40;n++) print \\\"line\\\" n}"\n') end screen:expect{any='line40 '} diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index 312e060a70..99b25cbf48 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -902,7 +902,7 @@ end) -- does not initialize the TUI. describe("TUI 't_Co' (terminal colors)", function() local screen - local is_freebsd = (string.lower(uname()) == 'freebsd') + local is_freebsd = (uname() == 'freebsd') local function assert_term_colors(term, colorterm, maxcolors) helpers.clear({env={TERM=term}, args={}}) @@ -1176,8 +1176,8 @@ end) -- does not initialize the TUI. describe("TUI 'term' option", function() local screen - local is_bsd = not not string.find(string.lower(uname()), 'bsd') - local is_macos = not not string.find(string.lower(uname()), 'darwin') + local is_bsd = not not string.find(uname(), 'bsd') + local is_macos = not not string.find(uname(), 'darwin') local function assert_term(term_envvar, term_expected) clear() @@ -1203,7 +1203,9 @@ describe("TUI 'term' option", function() end) it('gets system-provided term if $TERM is valid', function() - if is_bsd then -- BSD lacks terminfo, builtin is always used. + if uname() == "openbsd" then + assert_term("xterm", "xterm") + elseif is_bsd then -- BSD lacks terminfo, builtin is always used. assert_term("xterm", "builtin_xterm") elseif is_macos then local status, _ = pcall(assert_term, "xterm", "xterm") |