# HG changeset patch
# User Kai T. Ohlhus <k.ohlhus@gmail.com>
# Date 1593763167 -32400
# Node ID cb76bf0248e526b9ceab1562fc94725c29e5dee5
# Parent  d5311ca8f94507dd3d632f84a52652f8aa501c9b# Parent  8558c6ad4d71019d9780101dfa4778ee84c63808
maint: merge stable to default.

diff -r d5311ca8f945 -r cb76bf0248e5 scripts/testfun/assert.m
--- 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))
diff -r d5311ca8f945 -r cb76bf0248e5 test/nest/nest.tst
--- 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)