# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1273339779 25200
# Node ID 08050f37ba4976203732d5554efda6a2c2c30d53
# Parent  d1194069e58cdeafe34f152004164b33ac13a2dd
Don't abort testing when merely skipping a testif block.

Previously, test.m counted skipping a testif block as an error
which stopped testing.  This is not necessary and prevents
testing a file which contains a mixture of test blocks only some
of which are protected by testif clauses.

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-08  Rik <octave@nomad.inbox5.com>
+
+        * testfun/test.m: Don't abort testing when skipping a testif block
+
 2010-05-05  Rik <octave@nomad.inbox5.com>
 
         * statistics/tests/cor_test.m, statistics/tests/t_test.m, 
diff --git a/scripts/testfun/test.m b/scripts/testfun/test.m
--- a/scripts/testfun/test.m
+++ b/scripts/testfun/test.m
@@ -447,10 +447,8 @@
       [__e, __feat] = regexp (__code, '^\s*([^\s]+)', 'end', 'tokens');
       if (isempty (findstr (octave_config_info ("DEFS"), __feat{1}{1})))
         __xskip++;
-        __success = 0;
         __istest = 0;
-        ## Skip the code.
-        __code = "";
+        __code = ""; # Skip the code.
         __msg = sprintf ("%sskipped test\n", __signal_skip);
       else
         __istest = 1;