Mercurial > octave
changeset 29115:756cd46286c6 stable
maint: Merge away extra head on stable.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 27 Nov 2020 13:46:20 -0500 |
| parents | 9d3ed4e2a1a2 (current diff) 158f9d2320c7 (diff) |
| children | 14545c8b1b73 d34558c873dc |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/util/linkprop.m Fri Nov 27 13:44:11 2020 -0500 +++ b/scripts/plot/util/linkprop.m Fri Nov 27 13:46:20 2020 -0500 @@ -85,6 +85,10 @@ set (h(2:end), prop{j}, get (h(1), prop{j})); endfor + ## FIXME: This file needs to be locked to avoid bug #59439. Remove this + ## lock once that bug is properly fixed. + mlock (); + ## Add listeners to all objects for i = 1 : numel (h) for j = 1 : numel (prop)
--- a/scripts/sparse/eigs.m Fri Nov 27 13:44:11 2020 -0500 +++ b/scripts/sparse/eigs.m Fri Nov 27 13:46:20 2020 -0500 @@ -488,7 +488,7 @@ %! opts.issym = 1; opts.isreal = 1; %! d1 = eigs (fn, n, k, 4.1, opts); %! assert (d1, eigs (A, k, 4.1), 1e-11); -%!testif HAVE_ARPACK +%!testif HAVE_ARPACK, HAVE_UMFPACK %! AA = speye (10); %! fn = @(x) AA * x; %! opts.issym = 1; opts.isreal = 1; @@ -1480,7 +1480,7 @@ %! warning ("off", "Octave:eigs:UnconvergedEigenvalues", "local"); %! d = eigs (Afun, 100, 6, "lm", opts); %! assert (d(6), NaN+1i*NaN); -%!testif HAVE_ARPACK +%!testif HAVE_ARPACK, HAVE_CHOLMOD %! A = sparse (magic (10)); %! B = sparse (magic (10)); # not HPD %! fail ("eigs (A, B, 4)", "eigs: The matrix B is not positive definite")