Mercurial > octave

changeset 28531:cb76bf0248e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Fri, 03 Jul 2020 16:59:27 +0900
parents d5311ca8f945 (current diff) 8558c6ad4d71 (diff)
children 05a48a241da6
files
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/testfun/assert.m	Thu Jul 02 18:16:10 2020 +0200
+++ b/scripts/testfun/assert.m	Fri Jul 03 16:59:27 2020 +0900
@@ -196,6 +196,9 @@
           err.reason{end+1} = "Structure fieldname mismatch";
         else
           try
+            ## Test if both structs are empty, i.e. 0x0, Nx0, or Nx0 structs.
+            ## In this case the values cannot be extracted for comparison as
+            ## they are not assignable and not defined.
             assert (isempty (cond), isempty (expected));
 
             if (! isempty (cond))
--- a/test/nest/nest.tst	Thu Jul 02 18:16:10 2020 +0200
+++ b/test/nest/nest.tst	Fri Jul 03 16:59:27 2020 +0900
@@ -41,7 +41,7 @@
 ##        worked.  The output of "script_nest" is unassigned. This got
 ##        revealed by fixing bug #58686.
 
-%!xtest assert (script_nest (), 5)
+%!xtest <58691> assert (script_nest (), 5)
 
 %!assert (arg_ret (), 10)