aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-03-27 01:39:45 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-03-29 08:23:03 -0400
commit3dbcf69888b0f44c06b9ede3928fcd9d68f65739 (patch)
tree0fef1ed874ef5d81f4ecbde5abcdbf55a547deca /src
parent8b60368c1b9e23f0695557da170d416d71f7e6a3 (diff)
downloadrneovim-3dbcf69888b0f44c06b9ede3928fcd9d68f65739.tar.gz
rneovim-3dbcf69888b0f44c06b9ede3928fcd9d68f65739.tar.bz2
rneovim-3dbcf69888b0f44c06b9ede3928fcd9d68f65739.zip
test/old: run most tests in test_regexp_latin.vim
Most tests here don't depend on 'set encoding=latin1'. Skip Test_recursive_addstate() because of ASAN build.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/Makefile5
-rw-r--r--src/nvim/testdir/test_alot_latin.vim3
-rw-r--r--src/nvim/testdir/test_regexp_latin.vim5
3 files changed, 5 insertions, 8 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index b760828458..4641408069 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -31,14 +31,11 @@ endif
SCRIPTS ?= $(SCRIPTS_DEFAULT)
# Tests using runtest.vim.
-NEW_TESTS_ALOT := test_alot_utf8 test_alot
+NEW_TESTS_ALOT := test_alot_utf8 test_alot test_alot_latin
NEW_TESTS_IN_ALOT := $(shell sed -n '/^source/ s/^source //; s/\.vim$$//p' $(addsuffix .vim,$(NEW_TESTS_ALOT)))
-NEW_TESTS_IN_ALOT_LATIN := $(shell sed -n '/^source/ s/^source //; s/\.vim$$//p' test_alot_latin.vim)
# Ignored tests.
-# test_alot_latin: Nvim does not allow setting encoding.
# test_largefile: uses too much resources to run on CI.
NEW_TESTS_IGNORE := \
- test_alot_latin $(NEW_TESTS_IN_ALOT_LATIN) \
test_largefile \
NEW_TESTS := $(sort $(basename $(notdir $(wildcard test_*.vim))))
diff --git a/src/nvim/testdir/test_alot_latin.vim b/src/nvim/testdir/test_alot_latin.vim
index ebb3bde4ce..23a404cac1 100644
--- a/src/nvim/testdir/test_alot_latin.vim
+++ b/src/nvim/testdir/test_alot_latin.vim
@@ -4,7 +4,4 @@
" These tests use latin1 'encoding'. Setting 'encoding' is in the individual
" files, so that they can be run by themselves.
-" Nvim does not allow setting 'encoding', so skip this test group.
-finish
-
source test_regexp_latin.vim
diff --git a/src/nvim/testdir/test_regexp_latin.vim b/src/nvim/testdir/test_regexp_latin.vim
index a1da5db778..cacdd68d10 100644
--- a/src/nvim/testdir/test_regexp_latin.vim
+++ b/src/nvim/testdir/test_regexp_latin.vim
@@ -1,5 +1,5 @@
" Tests for regexp in latin1 encoding
-set encoding=latin1
+" set encoding=latin1
scriptencoding latin1
func s:equivalence_test()
@@ -22,11 +22,13 @@ func s:equivalence_test()
endfunc
func Test_equivalence_re1()
+ throw 'skipped: Nvim does not support enc=latin1'
set re=1
call s:equivalence_test()
endfunc
func Test_equivalence_re2()
+ throw 'skipped: Nvim does not support enc=latin1'
set re=2
call s:equivalence_test()
endfunc
@@ -98,6 +100,7 @@ func Test_multi_failure()
endfunc
func Test_recursive_addstate()
+ throw 'skipped: TODO: '
" This will call addstate() recursively until it runs into the limit.
let lnum = search('\v((){328}){389}')
call assert_equal(0, lnum)