Mercurial > octave
changeset 25713:5b1e7256a8de
maint: Merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 01 Aug 2018 12:25:25 -0400 |
| parents | 02fbbde15308 (current diff) 5625b2237a4d (diff) |
| children | ad0b4817c09d |
| files | configure.ac |
| diffstat | 3 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Jul 31 21:03:08 2018 -0700 +++ b/configure.ac Wed Aug 01 12:25:25 2018 -0400 @@ -41,7 +41,7 @@ OCTAVE_COPYRIGHT="Copyright (C) 2018 John W. Eaton and others." -OCTAVE_RELEASE_DATE="2018-07-13" +OCTAVE_RELEASE_DATE="2018-07-30" ## The "API version" is used as a way of checking that interfaces in the ## liboctave and libinterp libraries haven't changed in a backwardly
--- a/scripts/miscellaneous/run.m Tue Jul 31 21:03:08 2018 -0700 +++ b/scripts/miscellaneous/run.m Wed Aug 01 12:25:25 2018 -0400 @@ -91,19 +91,20 @@ ## Test script file execution +## Use a variable name that is unlikely to be the name of a function. %!test -%! clear A # the variable "A" should be set by the script -%! assert (exist ("A"), 0); +%! clear _5yVNhWVJWJn47RKnzxPsyb_ +%! assert (exist ("_5yVNhWVJWJn47RKnzxPsyb_"), 0); %! tmp_dir = tempname (); %! test_script = fullfile (tmp_dir, "test_script.m"); %! unwind_protect %! mkdir (tmp_dir); %! fid = fopen (test_script, "w"); -%! fprintf (fid, "A = 1337;\n"); +%! fprintf (fid, "_5yVNhWVJWJn47RKnzxPsyb_ = 1337;\n"); %! fclose (fid); %! run (test_script); -%! assert (exist ("A", "var"), 1); -%! assert (A, 1337); +%! assert (exist ("_5yVNhWVJWJn47RKnzxPsyb_", "var"), 1); +%! assert (_5yVNhWVJWJn47RKnzxPsyb_, 1337); %! unwind_protect_cleanup %! unlink (test_script); %! rmdir (tmp_dir);
--- a/scripts/ode/ode15i.m Tue Jul 31 21:03:08 2018 -0700 +++ b/scripts/ode/ode15i.m Wed Aug 01 12:25:25 2018 -0400 @@ -579,7 +579,7 @@ %!testif HAVE_SUNDIALS %! saved_opts = warning (); %! warning ("off", "all"); -%! opt = odeset ("Jacobian", "foo"); +%! opt = odeset ("Jacobian", "_5yVNhWVJWJn47RKnzxPsyb_"); %! fail ("[t, y] = ode15i (@rob, [0, 4e6], [1; 0; 0], [-1e-4; 1e-4; 0], opt)", %! "invalid value assigned to field 'Jacobian'"); %! warning (saved_opts); @@ -622,7 +622,7 @@ %! "ode15i: y0 must have 2 elements"); %!testif HAVE_SUNDIALS -%! opt = odeset ("RelTol", "foo"); +%! opt = odeset ("RelTol", "_5yVNhWVJWJn47RKnzxPsyb_"); %! fail ("[t, y] = ode15i (@fun, [0, 2], 2, 2, opt)", %! "ode15i: RelTol must be of class:"); @@ -637,7 +637,7 @@ %! "ode15i: RelTol must be positive"); %!testif HAVE_SUNDIALS -%! opt = odeset ("AbsTol", "foo"); +%! opt = odeset ("AbsTol", "_5yVNhWVJWJn47RKnzxPsyb_"); %! fail ("[t, y] = ode15i (@fun, [0, 2], 2, 2, opt)", %! "ode15i: AbsTol must be of class:");