diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-26 20:14:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-26 20:14:56 +0200 |
| commit | 1eceadaf481e34ed8155011534159775697ce884 (patch) | |
| tree | 9702813aaebc0ea9b0c213265be56ab61a0c360f | |
| parent | c79d6aa01d86cd98cffddc80825c1c600e833bbf (diff) | |
patch 8.0.0014v8.0.0014
Problem: Crypt tests are old style.
Solution: Convert to new style.
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
| -rw-r--r-- | src/testdir/test71.in | 94 | ||||
| -rw-r--r-- | src/testdir/test71.ok | 15 | ||||
| -rw-r--r-- | src/testdir/test71a.in | 18 | ||||
| -rw-r--r-- | src/testdir/test_crypt.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
7 files changed, 7 insertions, 130 deletions
diff --git a/src/Makefile b/src/Makefile index 61c5919d07..d7658e9360 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2048,7 +2048,7 @@ test1 \ test40 test41 test42 test43 test44 test45 test48 test49 \ test50 test51 test52 test53 test54 test55 test56 test57 test58 test59 \ test60 test64 test65 test66 test67 test68 test69 \ - test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \ + test70 test72 test73 test74 test75 test76 test77 test78 test79 \ test80 test82 test83 test84 test85 test86 test87 test88 test89 \ test90 test91 test92 test93 test94 test95 test97 test98 test99 \ test100 test101 test103 test104 test107 test108: diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index 999f519abf..0909f4f7cc 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -53,7 +53,6 @@ SCRIPTS_ALL = \ test68.out \ test69.out \ test70.out \ - test71.out \ test73.out \ test75.out \ test76.out \ diff --git a/src/testdir/test71.in b/src/testdir/test71.in deleted file mode 100644 index 944b69dc52..0000000000 --- a/src/testdir/test71.in +++ /dev/null @@ -1,94 +0,0 @@ -Test for encryption. -The test data is in another file to avoid problems with 'encoding', especially -cp932. - -STARTTEST -:so small.vim -:set enc=latin1 -:bwipe! -:r test71a.in -:/^start of text/+1 -:let text_lines = getline('.', line('.') + 2) -:/^start of cm=zip bytes/+1 -:let cm0_bytes = getline('.', '.') -:/^start of cm=blowfish bytes/+1 -:let cm1_bytes = getline('.', '.') -:/^start of cm=blowfish2 bytes/+1 -:let cm2_bytes = getline('.', '.') -:bwipe! -:call append(0, text_lines) -:$d -:X -foobar -foobar -:w! Xtestfile -:bwipe! -:e Xtestfile -foobar -:let cm0_read_back = getline('.', '$') -:set key= -:set cryptmethod=blowfish -:" If the blowfish test fails 'cryptmethod' will be 'zip' now. -:%s/^/\=&cryptmethod == 'blowfish' ? "OK " : "blowfish test failed "/ -:X -barfoo -barfoo -:w! Xtestfile -:bwipe! -:e Xtestfile -barfoo -:let cm1_read_back = getline('.', '$') -:set key= -:set cryptmethod=blowfish2 -:" If the blowfish test fails 'cryptmethod' will be 'zip' now. -:%s/^/\=&cryptmethod == 'blowfish2' ? "OK " : "blowfish test failed "/ -:X -bar2foo -bar2foo -:w! Xtestfile -:bwipe! -:e Xtestfile -bar2foo -:let cm2_read_back = getline('.', '$') -:bwipe! -:set bin noeol key= -:call append(0, cm0_bytes) -:$d -:set fenc=latin1 -:w! Xtestfile -:bwipe! -:set nobin -:e Xtestfile -foofoo -:let cm0_read_bin = getline('.', '$') -:bwipe! -:set bin noeol key= -:call append(0, cm1_bytes) -:$d -:set fenc=latin1 -:w! Xtestfile -:bwipe! -:set nobin -:e Xtestfile -barbar -:let cm1_read_bin = getline('.', '$') -:bwipe! -:set bin noeol key= -:call append(0, cm2_bytes) -:$d -:set fenc=latin1 -:w! Xtestfile -:bwipe! -:set nobin -:e Xtestfile -barburp -:call append(0, cm1_read_bin) -:call append(0, cm0_read_bin) -:call append(0, cm2_read_back) -:call append(0, cm1_read_back) -:call append(0, cm0_read_back) -:set key= fenc=latin1 -:w! test.out -:qa! -ENDTEST - diff --git a/src/testdir/test71.ok b/src/testdir/test71.ok deleted file mode 100644 index de1b0ab837..0000000000 --- a/src/testdir/test71.ok +++ /dev/null @@ -1,15 +0,0 @@ -01234567890123456789012345678901234567 -line 2 foo bar blah -line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -OK 01234567890123456789012345678901234567 -OK line 2 foo bar blah -OK line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -OK OK 01234567890123456789012345678901234567 -OK OK line 2 foo bar blah -OK OK line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -1234567890 -abbccddeff -asdfasdfasdf -0001112223333 -abcdefghijklmnopqrstuvwxyz -!@#$%^&*()_+=-`~ diff --git a/src/testdir/test71a.in b/src/testdir/test71a.in deleted file mode 100644 index e79a39895a..0000000000 --- a/src/testdir/test71a.in +++ /dev/null @@ -1,18 +0,0 @@ - -start of text -01234567890123456789012345678901234567 -line 2 foo bar blah -line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -end of text - -start of cm=zip bytes -VimCrypt~01! lV'}MgVE#32U -end of cm=zip bytes - -start of cm=blowfish bytes -VimCrypt~02!k)#S=#MJAͥM!
-end of cm=blowfish bytes - -start of cm=blowfish2 bytes -VimCrypt~03! N;^C).FS6[T˧ؾ9 2 Q@ߚIv.`$% -end of cm=blowfish2 bytes diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim index 96b8b1bfab..4e9cc2e512 100644 --- a/src/testdir/test_crypt.vim +++ b/src/testdir/test_crypt.vim @@ -1,5 +1,8 @@ " Tests for encryption. -" TODO: include tests from test71. + +if !has('cryptv') + finish +endif func Common_head_only(text) " This was crashing Vim diff --git a/src/version.c b/src/version.c index 0fe28ca27d..cf9b1986a6 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 14, +/**/ 13, /**/ 12, |