Mercurial > hg > octave-nkf

diff scripts/testfun/test.m @ 7028:ecd6347f7d1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-10-15 09:00:02 by dbateman]
author dbateman
date Mon, 15 Oct 2007 09:00:02 +0000
parents a1dbe9d80eee
children aeeb646f6538
line wrap: on
line diff
--- a/scripts/testfun/test.m
+++ b/scripts/testfun/test.m
@@ -381,21 +381,22 @@
 	warning ("on", "quiet");
       	try
  	  eval (sprintf ("__test__(%s);", __shared));
-	  __err = trimerr (lastwarn, "warning");
-          warning (__warnstate.state, "quiet");
-
           if (! __warning)
        	    __msg = sprintf ("%sexpected <%s> but got no error\n",
  			     __signal_fail, __pattern);
-          elseif (isempty (__err))
-            __msg = sprintf ("%sexpected <%s> but got no warning\n",
+	  else
+	    __err = trimerr (lastwarn, "warning");
+            warning (__warnstate.state, "quiet");
+            if (isempty (__err))
+              __msg = sprintf ("%sexpected <%s> but got no warning\n",
 			     __signal_fail, __pattern);
-          elseif (isempty (regexp (__err, __pattern, "once")))
-            __msg = sprintf ("%sexpected <%s> but got %s\n",
- 			     __signal_fail, __pattern, __err);
-          else
-            __success = 1;
-          endif
+            elseif (isempty (regexp (__err, __pattern, "once")))
+              __msg = sprintf ("%sexpected <%s> but got %s\n",
+ 			       __signal_fail, __pattern, __err);
+            else
+              __success = 1;
+            endif
+	  endif
 
       	catch
 	  __err = trimerr (lasterr, "error");