summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-05-19 15:01:10 +0200
committerBram Moolenaar <Bram@vim.org>2018-05-19 15:01:10 +0200
commit10561fe0a37efd611ccb1517b37de12d2e37af0f (patch)
tree2d8192e5c9a2ee44be0083afdf4eb981e504a33a
parent2abad54cede7c33f090fbde19a9a3eb3dbf78e53 (diff)
patch 8.1.0003: the :compiler command is not testedv8.1.0003
Problem: The :compiler command is not tested. Solution: Add a test. (Dominique Pelle, closes #2930)
-rw-r--r--src/Makefile1
-rw-r--r--src/testdir/test_alot.vim1
-rw-r--r--src/testdir/test_compiler.vim50
-rw-r--r--src/version.c2
4 files changed, 54 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 98fd14220b..0e4c555627 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2150,6 +2150,7 @@ test_arglist \
test_cmdline \
test_command_count \
test_comparators \
+ test_compiler \
test_crypt \
test_cscope \
test_cursor_func \
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index b8a56502b1..ac3ca74f53 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -5,6 +5,7 @@ source test_assign.vim
source test_bufline.vim
source test_cd.vim
source test_changedtick.vim
+source test_compiler.vim
source test_cursor_func.vim
source test_delete.vim
source test_ex_undo.vim
diff --git a/src/testdir/test_compiler.vim b/src/testdir/test_compiler.vim
new file mode 100644
index 0000000000..fd3510d60b
--- /dev/null
+++ b/src/testdir/test_compiler.vim
@@ -0,0 +1,50 @@
+" Test the :compiler command
+
+func Test_compiler()
+ if !executable('perl')
+ return
+ endif
+
+ e Xfoo.pl
+ compiler perl
+ call assert_equal('perl', b:current_compiler)
+ call assert_fails('let g:current_compiler', 'E121:')
+
+ call setline(1, ['#!/usr/bin/perl -w', 'use strict;', 'my $foo=1'])
+ w!
+ call feedkeys(":make\<CR>\<CR>", 'tx')
+ call assert_fails('clist', 'E42:')
+
+ call setline(1, ['#!/usr/bin/perl -w', 'use strict;', '$foo=1'])
+ w!
+ call feedkeys(":make\<CR>\<CR>", 'tx')
+ let a=execute('clist')
+ call assert_equal("\n 1 Xfoo.pl:3: Global symbol \"\$foo\" "
+ \ . "requires explicit package name "
+ \ . "(did you forget to declare \"my $foo\"?)", a)
+
+ call delete('Xfoo.pl')
+ bw!
+endfunc
+
+func Test_compiler_without_arg()
+ let a=split(execute('compiler'))
+ call assert_equal($VIMRUNTIME . '/compiler/ant.vim', a[0])
+ call assert_equal($VIMRUNTIME . '/compiler/bcc.vim', a[1])
+ call assert_equal($VIMRUNTIME . '/compiler/xmlwf.vim', a[-1])
+endfunc
+
+func Test_compiler_completion()
+ call feedkeys(":compiler \<C-A>\<C-B>\"\<CR>", 'tx')
+ call assert_match('^"compiler ant bcc .* xmlwf$', @:)
+
+ call feedkeys(":compiler p\<C-A>\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"compiler pbx perl php pylint pyunit', @:)
+
+ call feedkeys(":compiler! p\<C-A>\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"compiler! pbx perl php pylint pyunit', @:)
+endfunc
+
+func Test_compiler_error()
+ call assert_fails('compiler doesnotexist', 'E666:')
+endfunc
diff --git a/src/version.c b/src/version.c
index 9d92ef8cde..9ceabc7bfc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3,
+/**/
2,
/**/
1,