Mercurial > octave
changeset 28295:a01ad9893641
maint: merge stable to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Thu, 14 May 2020 11:32:06 +0200 |
| parents | 332e644726f9 (current diff) 7096f672f611 (diff) |
| children | e55ff14249c3 |
| files | libinterp/corefcn/syscalls.cc libinterp/corefcn/utils.cc scripts/linear-algebra/condest.m |
| diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/syscalls.cc Tue May 12 10:42:09 2020 +0200 +++ b/libinterp/corefcn/syscalls.cc Thu May 14 11:32:06 2020 +0200 @@ -1395,8 +1395,9 @@ @deftypefn {} {[@var{cname}, @var{status}, @var{msg}] =} canonicalize_file_name (@var{fname}) Return the canonical name of file @var{fname}. -If the file does not exist the empty string ("") is returned. -@seealso{make_absolute_filename, is_absolute_filename, is_rooted_relative_filename, is_same_file} +If the file does not exist the empty string ("") is returned. No tilde +expansion of @var{fname} is performed. +@seealso{make_absolute_filename, is_absolute_filename, is_rooted_relative_filename, is_same_file, tilde_expand} @end deftypefn */) { if (args.length () != 1)
--- a/libinterp/corefcn/utils.cc Tue May 12 10:42:09 2020 +0200 +++ b/libinterp/corefcn/utils.cc Thu May 14 11:32:06 2020 +0200 @@ -1002,8 +1002,9 @@ Return the full name of @var{file} beginning from the root of the file system. -No check is done for the existence of @var{file}. -@seealso{canonicalize_file_name, is_absolute_filename, is_rooted_relative_filename, isfolder} +No check is done for the existence of @var{file}. No tilde expansion of +@var{file} is performed. +@seealso{canonicalize_file_name, is_absolute_filename, is_rooted_relative_filename, isfolder, tilde_expand} @end deftypefn */) { if (args.length () != 1)
--- a/scripts/linear-algebra/condest.m Tue May 12 10:42:09 2020 +0200 +++ b/scripts/linear-algebra/condest.m Thu May 14 11:32:06 2020 +0200 @@ -389,7 +389,7 @@ %! cest = condest (A); %! assert (cest, cexp, -2*eps); -%!test <*57968> +%!testif HAVE_UMFPACK <*57968> %! As = sparse (reshape (sqrt (0:15), 4, 4)); %! cexp = norm (As, 1) * norm (inv (As), 1); %! cest = condest (As);