Mercurial > octave
changeset 26727:88653f8d536d
maint: Merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 13 Feb 2019 15:38:23 +0000 |
| parents | 456726d276a6 (current diff) b3b78bf83113 (diff) |
| children | f034b29320ad |
| files | test/figure_files/ofig403.ofig test/figure_files/ofig421.ofig test/figure_files/ofig51.ofig test/hgload.tst test/module.mk |
| diffstat | 10 files changed, 56 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/bug-53468/bug-53468.tst Wed Feb 13 15:38:23 2019 +0000 @@ -0,0 +1,47 @@ +## Copyright (C) 2018 Pantxo Diribarne +## +## This file is part of Octave. +## +## Octave is free software: you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, see +## <https://www.gnu.org/licenses/>. + +## Load an Octave 4.0.3 figure file +%!test +%! unwind_protect +%! hf = hgload ("ofig403.ofig"); +%! unwind_protect_cleanup +%! if (exist ("hf", "var") && isfigure (hf)) +%! close (hf) +%! endif +%! end_unwind_protect + +## Load an Octave 4.2.1 figure file +%!test +%! unwind_protect +%! hf = hgload ("ofig421.ofig"); +%! unwind_protect_cleanup +%! if (exist ("hf", "var") && isfigure (hf)) +%! close (hf) +%! endif +%! end_unwind_protect + +## Load an Octave 5.1 figure file +%!test +%! unwind_protect +%! hf = hgload ("ofig51.ofig"); +%! unwind_protect_cleanup +%! if (exist ("hf", "var") && isfigure (hf)) +%! close (hf) +%! endif +%! end_unwind_protect
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/bug-53468/module.mk Wed Feb 13 15:38:23 2019 +0000 @@ -0,0 +1,8 @@ +bug_53468_TEST_FILES = \ + %reldir%/bug-53468.tst \ + %reldir%/ofig403.ofig \ + %reldir%/ofig421.ofig \ + %reldir%/ofig51.ofig + +TEST_FILES += $(bug_53468_TEST_FILES) +
--- a/test/hgload.tst Wed Feb 13 13:03:20 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -## Copyright (C) 2018 Pantxo Diribarne -## -## This file is part of Octave. -## -## Octave is free software: you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <https://www.gnu.org/licenses/>. - -## Load an Octave 4.0.3 figure file -%!test -%! hgload (fullfile ("figure_files", "ofig403.ofig")); - -## Load an Octave 4.2.1 figure file -%!test -%! hgload (fullfile ("figure_files", "ofig421.ofig")); - -## Load an Octave 5.1 figure file -%!test -%! hgload (fullfile ("figure_files", "ofig51.ofig"));
--- a/test/module.mk Wed Feb 13 13:03:20 2019 +0000 +++ b/test/module.mk Wed Feb 13 15:38:23 2019 +0000 @@ -75,6 +75,7 @@ include %reldir%/bug-52075/module.mk include %reldir%/bug-52722/module.mk include %reldir%/bug-53027/module.mk +include %reldir%/bug-53468/module.mk include %reldir%/bug-54995/module.mk include %reldir%/class-concat/module.mk include %reldir%/classdef/module.mk