[Pkg-octave-commit] [octave-ltfat] 01/01: debian/rules: Run tests with xvfb-run

Rafael Laboissière rlaboiss-guest at moszumanska.debian.org
Fri May 16 12:21:44 UTC 2014


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

rlaboiss-guest pushed a commit to branch master
in repository octave-ltfat.

commit 45f567833f2a645b1b9613b0b9fcf9b27a275417
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Fri May 16 14:15:56 2014 +0200

    debian/rules: Run tests with xvfb-run
    
    This simplifies the debian/check.m, in which we just specify now
    "graphics_toolkit gnuplot", instead of redefining the figure()
    function.  Running under xvfb-run is accomplished by using the new
    variable OCTPKG_TEST_ENV (hence the build-dependency on octave-pkg-dev
    >> 1.1.3). Also, build-depends on xvfb, xauth, and gnuplot-nox.
---
 debian/check.m | 9 ++-------
 debian/control | 3 ++-
 debian/rules   | 2 ++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/check.m b/debian/check.m
index 9352388..e8f15bf 100644
--- a/debian/check.m
+++ b/debian/check.m
@@ -1,12 +1,7 @@
-global figure_orig
-figure_orig= @figure;
-function figure (n)
-    global figure_orig
-    figure_orig (n, "visible", "off");
-endfunction
-
 addpath ([pwd(),"/inst"]);
 
+graphics_toolkit gnuplot;
+
 ## Avoid call of frsynabs with BFGS method, which would require
 ## the minFunc suite.
 
diff --git a/debian/control b/debian/control
index e5f453c..d43f786 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: math
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at laboissiere.net>
-Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.4)
+Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>> 1.1.2),
+ xauth, xvfb, gnuplot-nox
 Standards-Version: 3.9.5
 Homepage: http://octave.sourceforge.net/ltfat/
 Vcs-Git: git://anonscm.debian.org/pkg-octave/octave-ltfat.git
diff --git a/debian/rules b/debian/rules
index e34619c..a50dcc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
 
+OCTPKG_TEST_ENV = xvfb-run
+
 # The following rule is needed because an empty lib/ directory is
 # needed for building the package correctly.  Even though there is one
 # in the tarball, it is not created by gbp-import-orig, hence the

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-ltfat.git



More information about the Pkg-octave-commit mailing list