[neovim] 02/02: Adjust test execution mips*

James McCoy jamessan at debian.org
Mon Jan 16 12:14:18 UTC 2017


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

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

commit f35437df0708590ec3659c12faefa353d39cc47a
Author: James McCoy <jamessan at debian.org>
Date:   Mon Jan 16 06:57:14 2017 -0500

    Adjust test execution mips*
    
    * Re-enable functional tests on mipsel
    * Disable unit tests on mips* due to LuaJIT bug #849769
    * Disable installation of LuaJIT on mips*
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog |  2 ++
 debian/control   |  4 ++--
 debian/rules     | 12 ++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d26953..24c4521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 neovim (0.1.7-3) UNRELEASED; urgency=medium
 
   * Disable global_spec.lua since it's rather flaky.
+  * Re-enable functional tests on mips* but disable unit tests (which require
+    luajit) until #849769 is fixed.
 
  -- James McCoy <jamessan at debian.org>  Sun, 15 Jan 2017 13:51:28 -0500
 
diff --git a/debian/control b/debian/control
index b06fc62..a5b469c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  libacl1-dev,
  libjemalloc-dev [!hurd-any],
  libkvm-dev [kfreebsd-any],
- libluajit-5.1-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc powerpcspe],
+ libluajit-5.1-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-i386 powerpc powerpcspe],
  libmsgpack-dev (>= 1.0.0),
  libnss-wrapper <!nocheck>,
  libtermkey-dev,
@@ -22,7 +22,7 @@ Build-Depends:
  lua-lpeg,
  lua-mpack,
  lua-nvim [alpha amd64 armel armhf hppa i386 mips mips64el mipsel powerpc ppc64el sparc64 x32] <!nocheck>,
- luajit [amd64 armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc powerpcspe] | lua5.1,
+ luajit [amd64 armel armhf hurd-i386 i386 kfreebsd-i386 powerpc powerpcspe] | lua5.1,
  ninja-build,
  pkg-config
 Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index b543065..71eaa5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,16 +12,12 @@ export CFLAGS CXXFLAGS LDFLAGS
 
 FUNCTIONALTEST =
 UNITTEST =
-ifneq (mipsel,$(DEB_HOST_ARCH))
-  ifneq (,$(findstring ok installed,$(shell dpkg-query -W -f '$${Status}' lua-nvim)))
-    FUNCTIONALTEST = functionaltest
-  endif
+ifneq (,$(findstring ok installed,$(shell dpkg-query -W -f '$${Status}' lua-nvim)))
+  FUNCTIONALTEST = functionaltest
 endif
 
-ifneq (mipsel,$(DEB_HOST_ARCH))
-  ifneq (,$(findstring ok installed,$(shell dpkg-query -W -f '$${Status}' luajit)))
-    UNITTEST = unittest
-  endif
+ifneq (,$(findstring ok installed,$(shell dpkg-query -W -f '$${Status}' luajit)))
+  UNITTEST = unittest
 endif
 
 export USERNAME = pkg-vim-maintainers

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



More information about the pkg-vim-maintainers mailing list