[Pkg-octave-commit] [matlab2tikz] 12/15: New patches: unreliable-test.patch, path-issues.patch.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository matlab2tikz.

commit 6f3cddd5c955062675e32a855f196293e9fc4238
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Jan 4 17:12:26 2017 +0100

    New patches: unreliable-test.patch, path-issues.patch.
---
 debian/patches/path-issues.patch     | 77 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  2 +
 debian/patches/unreliable-test.patch | 17 ++++++++
 3 files changed, 96 insertions(+)

diff --git a/debian/patches/path-issues.patch b/debian/patches/path-issues.patch
new file mode 100644
index 0000000..38dc014
--- /dev/null
+++ b/debian/patches/path-issues.patch
@@ -0,0 +1,77 @@
+Description: Deal with path issues
+ All the code is installed under /usr/share/matlab2tikz/. But there is a
+ symlink to matlab2tikz.m under /usr/share/octave/site/m, so that Octave users
+ can have access to the matlab2tikz command without fiddling with path issues.
+ .
+ In order to make this setup work, it is necessary to add
+ /usr/share/matlab2tikz/ to the path when matlab2tikz.m is run (so that it can
+ access other functions).
+ .
+ The following modifications are also needed for the testsuite (run by
+ autopkgtest):
+ - add /usr/share/matlab2tikz to the path from runMatlab2TikzTests, because it
+   needs an auxiliary function there before any call to matlab2tikz.m
+ - modify m2troot.m so that computes the root of the unpacked source tree using
+   ACID.m instead of matlab2tikz.m
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+Last-Update: 2017-01-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/matlab2tikz.m
++++ b/src/matlab2tikz.m
+@@ -143,6 +143,14 @@ function matlab2tikz(varargin)
+                             'Octave', struct('name','3.8', 'num',[3 8]));
+     checkDeprecatedEnvironment(minimalVersion);
+ 
++    if exist('OCTAVE_VERSION')
++        warning('off', 'Octave:shadowed-function')
++    end
++    addpath /usr/share/matlab2tikz/
++    if exist('OCTAVE_VERSION')
++        warning('on', 'Octave:shadowed-function')
++    end
++
+     m2t.args            = []; % For command line arguments
+     m2t.current         = []; % For currently active objects
+     m2t.transform       = []; % For hgtransform groups
+--- a/test/runMatlab2TikzTests.m
++++ b/test/runMatlab2TikzTests.m
+@@ -7,7 +7,13 @@ CI_MODE = strcmpi(getenv('CONTINUOUS_INT
+ isJenkins = ~isempty(getenv('JENKINS_URL'));
+ 
+ %% Set path
+-addpath(fullfile(pwd,'..','src'));
++if exist('OCTAVE_VERSION')
++    warning('off', 'Octave:shadowed-function')
++end
++addpath('/usr/share/matlab2tikz');
++if exist('OCTAVE_VERSION')
++    warning('on', 'Octave:shadowed-function')
++end
+ addpath(fullfile(pwd,'suites'));
+ 
+ %% Select functions to run
+--- a/test/private/m2troot.m
++++ b/test/private/m2troot.m
+@@ -15,14 +15,15 @@ function rootpath = m2troot(varargin)
+     %    is equivalent to |fullfile(m2troot, ...)| and as such allows to 
+     %    easily produce a path to any file within the repository.
+     
+-    m2t = which('matlab2tikz');
++    m2t = which('ACID');
+     if isempty(m2t)
+-        error('M2TRoot:NotFound', 'Matlab2tikz was not found on the PATH!')
++        error('M2TRoot:NotFound', 'ACID was not found on the PATH!')
+     end
+     
+-    [srcpath] = fileparts(m2t);  % this should be $(m2troot)/src
+-    [rootpath, srcdir] = fileparts(srcpath); % this should be $(m2troot)
+-    assert(strcmpi(srcdir,'src'));
++    [srcpath] = fileparts(m2t);  % this should be $(m2troot)/test/suites
++    [srcpath] = fileparts(srcpath);  % this should be $(m2troot)/test
++    [rootpath, testdir] = fileparts(srcpath); % this should be $(m2troot)
++    assert(strcmpi(testdir,'test'));
+     
+     if nargin >= 1
+         rootpath = fullfile(rootpath, varargin{:});
diff --git a/debian/patches/series b/debian/patches/series
index 9a8790b..4cb3265 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 disable-updater.patch
+unreliable-test.patch
+path-issues.patch
diff --git a/debian/patches/unreliable-test.patch b/debian/patches/unreliable-test.patch
new file mode 100644
index 0000000..be3f1bd
--- /dev/null
+++ b/debian/patches/unreliable-test.patch
@@ -0,0 +1,17 @@
+Description: Mark test peaks_contourf as unreliable
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: no
+Last-Update: 2017-01-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/suites/ACID.m
++++ b/test/suites/ACID.m
+@@ -358,7 +358,7 @@ end
+ % =========================================================================
+ function [stat] = peaks_contourf ()
+   stat.description = 'Test the contourfill plots.';
+-  stat.unreliable = isMATLAB('>=', [8,4]); % FIXME: inspect this
++  stat.unreliable = 1; % FIXME: inspect this
+   stat.issues = 582;
+ 
+   [trash, h] = contourf(peaks(20), 10);

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