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/core | |
| 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/core')
| -rw-r--r-- | test/functional/core/channels_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/core/job_spec.lua | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/core/channels_spec.lua b/test/functional/core/channels_spec.lua index ddaed1c448..852d9808f5 100644 --- a/test/functional/core/channels_spec.lua +++ b/test/functional/core/channels_spec.lua @@ -139,8 +139,8 @@ describe('channels', function() command("call chansend(id, 'incomplet\004')") - local is_freebsd = (string.lower(uname()) == 'freebsd') - local bsdlike = is_freebsd or (os_name() == "osx") + local is_bsd = not not string.find(uname(), 'bsd') + local bsdlike = is_bsd or (os_name() == "osx") local extra = bsdlike and "^D\008\008" or "" expect_twoline(id, "stdout", "incomplet"..extra, "[1, ['incomplet'], 'stdin']", true) diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua index 2531b45521..73b0a0009d 100644 --- a/test/functional/core/job_spec.lua +++ b/test/functional/core/job_spec.lua @@ -429,7 +429,7 @@ describe('jobs', function() if has('win32') let cmd = 'for /L %I in (1,1,5) do @(echo %I& ping -n 2 127.0.0.1 > nul)' else - let cmd = ['sh', '-c', 'for i in $(seq 1 5); do echo $i; sleep 0.1; done'] + let cmd = ['sh', '-c', 'for i in 1 2 3 4 5; do echo $i; sleep 0.1; done'] endif let g:id = jobstart(cmd, d) sleep 1500m @@ -472,7 +472,7 @@ describe('jobs', function() if has('win32') let cmd = 'for /L %I in (1,1,5) do @(echo %I& ping -n 2 127.0.0.1 > nul)' else - let cmd = ['sh', '-c', 'for i in $(seq 1 5); do echo $i; sleep 0.1; done'] + let cmd = ['sh', '-c', 'for i in 1 2 3 4 5; do echo $i; sleep 0.1; done'] endif let g:id = jobstart(cmd, d) sleep 1500m |