[vim] 05/05: Move testing from install to build targets

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit a97dd481da59932a8490e7dc3fd8fd8bc9d3af26
Author: James McCoy <jamessan at debian.org>
Date:   Mon Sep 5 22:46:49 2016 -0400

    Move testing from install to build targets
    
    test_tabpage.vim's Test_tabpage_with_tab_modifier relies on filetype
    being set when the “:help” command is run.  Since this happens from the
    modeline, it doesn't occur when running as (fake)root, which causes the
    test to fail.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog |  2 ++
 debian/rules     | 12 +-----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fd19b2..362fcde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ vim (2:7.4.2330-1) UNRELEASED; urgency=medium
   * Update supported Ubuntu releases in debsources files.
   * Remove vim-gnome (which uses deprecated gnome2 libraries) in favor of
     vim-gtk3.  (Closes: #820239)
+  * Run tests during build targets to avoid test failures related to running
+    as (fake)root.
 
  -- James McCoy <jamessan at debian.org>  Sun, 04 Sep 2016 18:51:31 -0400
 
diff --git a/debian/rules b/debian/rules
index 62b6055..528556d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -272,6 +272,7 @@ build-stamp-%: configure-stamp-%
 	dh_prep -p $*
 	@echo "*** DEBIAN *** BUILDING VARIANT $*"
 	$(MAKE) -C src/$(SHADOWDIR)
+	[ $(MAKETEST) != "yes" ] || $(MAKE) -j1 -C src/$(SHADOWDIR) test
 	touch $@
 
 install: $(foreach v,$(VARIANTS),install-stamp-$(v))
@@ -308,17 +309,6 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
 	    install-languages \
 	    install-icons
 	
-# Tests need to be run in series, otherwise the terminal requests may not see
-# proper responses.
-# Prefer the vim-nox binary if it exists since that will also test the
-# language interfaces.
-	if [ $(MAKETEST) = "yes" ]; then \
-	  if [ -e src/vim-nox/vim ]; then \
-	    $(MAKE) -j1 -C src/vim-nox test; \
-	  else \
-	    $(MAKE) -j1 -C src/vim-basic test; \
-	  fi; \
-	fi
 	# installvimbin installs the vim binary under debian/tmp but we install
 	# it into the vim package from src/.  Need to rm it from debian/tmp so
 	# that dh_install doesn't fail

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git