Mercurial > octave
changeset 29494:76269aa97398
if bug number is supplied, prefer '%!test' over '%!xtest'
Files affected: dlmread.cc, file-io.cc, mappers.cc, pr-output.cc,
strfns.cc, asech.m, importdata.m, gammainc.m, test.m, classdef.tst,
io.tst, jit.tst, nest.tst.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 06 Apr 2021 10:47:40 -0400 |
| parents | de40b395b9c3 |
| children | 0cf53a415b7f |
| files | libinterp/corefcn/dlmread.cc libinterp/corefcn/file-io.cc libinterp/corefcn/mappers.cc libinterp/corefcn/pr-output.cc libinterp/corefcn/strfns.cc scripts/elfun/asech.m scripts/io/importdata.m scripts/specfun/gammainc.m scripts/testfun/test.m test/classdef/classdef.tst test/io.tst test/jit.tst test/nest/nest.tst |
| diffstat | 13 files changed, 28 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/dlmread.cc Tue Apr 06 10:43:17 2021 -0400 +++ b/libinterp/corefcn/dlmread.cc Tue Apr 06 10:47:40 2021 -0400 @@ -610,7 +610,7 @@ %! unlink (file); %! end_unwind_protect -%!xtest <47413> +%!test <47413> %! ## Same test code as above, but intended only for test statistics on Mac. %! if (! ismac ()), return; endif %! file = tempname (); @@ -667,7 +667,7 @@ %! unlink (file); %! end_unwind_protect -%!xtest <47413> +%!test <47413> %! ## Same test code as above, but intended only for test statistics on Mac. %! if (! ismac ()), return; endif %! file = tempname ();
--- a/libinterp/corefcn/file-io.cc Tue Apr 06 10:43:17 2021 -0400 +++ b/libinterp/corefcn/file-io.cc Tue Apr 06 10:47:40 2021 -0400 @@ -2323,7 +2323,7 @@ %! C = textscan (str, '%s', 'Delimiter', '\t', 'MultipleDelimsAsOne', false); %! assert (C{1}, {'a'; ''; 'b'; 'c'}); -%!xtest <50743> +%!test <50743> %! C = textscan ('5973459727478852968', '%u64'); %! assert (C{1}, uint64 (5973459727478852968));
--- a/libinterp/corefcn/mappers.cc Tue Apr 06 10:43:17 2021 -0400 +++ b/libinterp/corefcn/mappers.cc Tue Apr 06 10:47:40 2021 -0400 @@ -133,7 +133,7 @@ %! v = [0, pi, pi/2, pi/2]; %! assert (real (acos (x)), v); -%!xtest <*52627> +%!test <*52627> %! ## Same test code as above, but intended only for test statistics on Mac and %! ## Windows. Their trig/hyperbolic functions have huge tolerances. %! if (! ismac () && ! ispc ()), return; endif @@ -164,7 +164,7 @@ %! v = [0, pi/2*i, pi*i, pi/2*i]; %! assert (acosh (x), v, sqrt (eps)); -%!xtest <*52627> +%!test <*52627> %! ## Same test code as above, but intended only for test statistics on Mac. %! ## Mac trig/hyperbolic functions have huge tolerances. %! if (! ismac ()), return; endif @@ -187,7 +187,7 @@ %! v = single ([0, pi/2*i, pi*i, pi/2*i]); %! assert (acosh (x), v, sqrt (eps ("single"))); -%!xtest <*52627> +%!test <*52627> %! ## Same test code as above, but intended only for test statistics on Mac. %! ## Mac trig/hyperbolic functions have huge tolerances. %! if (! ismac ()), return; endif @@ -208,7 +208,7 @@ %! v = [0, pi, pi/2, -pi/2]; %! assert (imag (acosh (x)), v); -%!xtest <*52627> +%!test <*52627> %! ## Same test code as above, but intended only for test statistics on Mac and %! ## Windows. Their trig/hyperbolic functions have huge tolerances. %! if (! ismac () && ! ispc ()), return; endif @@ -336,7 +336,7 @@ %! v = [pi/2, -pi/2, 0, -0]; %! assert (real (asin (x)), v); -%!xtest <*52627> +%!test <*52627> %! ## Same test code as above, but intended only for test statistics on Mac and %! ## Windows. Their trig/hyperbolic functions have huge tolerances. %! if (! ismac () && ! ispc ()), return; endif @@ -379,7 +379,7 @@ %! v = [0, 0, pi/2, -pi/2]; %! assert (imag (asinh (x)), v); -%!xtest <*52627> +%!test <*52627> %! ## Same test code as above, but intended only for test statistics on Mac and %! ## Windows. Their trig/hyperbolic functions have huge tolerances. %! if (! ismac () && ! ispc ()), return; endif
--- a/libinterp/corefcn/pr-output.cc Tue Apr 06 10:43:17 2021 -0400 +++ b/libinterp/corefcn/pr-output.cc Tue Apr 06 10:47:40 2021 -0400 @@ -3305,7 +3305,7 @@ %!assert <*57004> (rats ([]), '') -%!xtest <57704> +%!test <57704> %! [old_fmt, old_spacing] = format (); %! unwind_protect %! format short;
--- a/libinterp/corefcn/strfns.cc Tue Apr 06 10:43:17 2021 -0400 +++ b/libinterp/corefcn/strfns.cc Tue Apr 06 10:47:40 2021 -0400 @@ -831,7 +831,7 @@ %!assert (str2double ("-.1e-5"), -1e-6) %!testif ; ! ismac () %! assert (str2double (char ("1", "2 3", "4i")), [1; NaN; 4i]); -%!xtest <47413> +%!test <47413> %! ## Same test code as above, but intended only for test statistics on Mac. %! if (! ismac ()), return; endif %! assert (str2double (char ("1", "2 3", "4i")), [1; NaN; 4i]); @@ -859,12 +859,12 @@ %!assert (str2double ("-i*NaN - Inf"), complex (-Inf, -NaN)) %!testif ; ! ismac () %! assert (str2double ({"abc", "4i"}), [NaN + 0i, 4i]); -%!xtest <47413> +%!test <47413> %! if (! ismac ()), return; endif %! assert (str2double ({"abc", "4i"}), [NaN + 0i, 4i]); %!testif ; ! ismac () %! assert (str2double ({2, "4i"}), [NaN + 0i, 4i]) -%!xtest <47413> +%!test <47413> %! if (! ismac ()), return; endif %! assert (str2double ({2, "4i"}), [NaN + 0i, 4i]) %!assert (str2double (zeros (3,1,2)), NaN)
--- a/scripts/elfun/asech.m Tue Apr 06 10:43:17 2021 -0400 +++ b/scripts/elfun/asech.m Tue Apr 06 10:47:40 2021 -0400 @@ -45,7 +45,7 @@ %! x = [1, -1]; %! assert (asech (x), v, sqrt (eps)); -%!xtest <*52627> +%!test <*52627> %! ## Same test code as above, but intended only for test statistics on Mac. %! ## Mac trig/hyperbolic functions have huge tolerances. %! if (! ismac ()), return; endif
--- a/scripts/io/importdata.m Tue Apr 06 10:43:17 2021 -0400 +++ b/scripts/io/importdata.m Tue Apr 06 10:47:40 2021 -0400 @@ -535,7 +535,7 @@ %! assert (d, "\t"); %! assert (h, 0); -%!xtest <47413> +%!test <47413> %! ## Same test code as above, but intended only for test statistics on Mac. %! if (! ismac ()), return; endif %! ## Complex numbers
--- a/scripts/specfun/gammainc.m Tue Apr 06 10:43:17 2021 -0400 +++ b/scripts/specfun/gammainc.m Tue Apr 06 10:47:40 2021 -0400 @@ -538,7 +538,7 @@ %! y_exp = 9.995001666250085e-04; %! assert (gammainc (1/1000, 1), y_exp, -eps); -%!xtest <53612> +%!test <53612> %! assert (gammainc (-20, 1.1, "upper"), ... %! 6.50986687074979e8 + 2.11518396291149e8*i, -1e-13);
--- a/scripts/testfun/test.m Tue Apr 06 10:43:17 2021 -0400 +++ b/scripts/testfun/test.m Tue Apr 06 10:47:40 2021 -0400 @@ -1063,7 +1063,7 @@ ## Test 'xtest' keyword %!xtest %! assert (1, 1); # Test passes -%!xtest <53613> +%!test <53613> %! assert (0, 1); # Test fails ## Test comment block. It can contain anything.
--- a/test/classdef/classdef.tst Tue Apr 06 10:43:17 2021 -0400 +++ b/test/classdef/classdef.tst Tue Apr 06 10:47:40 2021 -0400 @@ -55,9 +55,9 @@ %!assert (p.principle == 50e3) %!assert (p.amount, amt, eps ()) %!assert (amount (p), amt, eps ()) -%!xtest <55961> +%!test <55961> %! assert (properties (p), {'rate'; 'term'; 'principle'}); -%!xtest <*55858> +%!test <*55858> %! assert (methods (p), {'amount'; 'foo_value_class'}); %!assert (isempty (foo_value_class().rate)) %!error <property 'rate' is not constant> foo_value_class.rate @@ -135,7 +135,7 @@ %! assert (isequal (obj(2:end), 5:7)) %! assert (isequal (obj.x, [7 5 6 7])) -%!xtest <54966> +%!test <54966> %! obj = foo_subsref_subsasgn (1); %! obj{1:3} = 5:7; %! assert (isequal ([obj{1:3}], 5:7)) @@ -171,7 +171,7 @@ %! assert (isequal (obj.x(2:end), 5:7)) %! assert (isequal (obj.x, [7 5 6 7])) -%!xtest <54966> +%!test <54966> %! obj = foo_subsref_subsasgn (1); %! obj.x{1:3} = 5:7; %! assert (isequal ([obj.x{1:3}], 5:7)) @@ -187,7 +187,7 @@ %! obj{2}{2} = 4; %! assert (obj{2}{2} == 4); -%!xtest <54966> +%!test <54966> %! obj = foo_subsref_subsasgn (2); %! obj{1:2}(1:2) = ones (2); %! assert (isequal (obj{1:2}(1:2), ones (2)));
--- a/test/io.tst Tue Apr 06 10:43:17 2021 -0400 +++ b/test/io.tst Tue Apr 06 10:47:40 2021 -0400 @@ -346,7 +346,7 @@ %! assert (msg, "sscanf: format failed to match"); %! assert (pos, 2); -%!xtest <47413> +%!test <47413> %! ## Same test code as above, but intended only for test statistics on Mac. %! if (! ismac ()), return; endif %! [val, count, msg, pos] = sscanf ("3I2", "%f"); @@ -362,7 +362,7 @@ %! assert (msg, "sscanf: format failed to match"); %! assert (pos, 2); -%!xtest <47413> +%!test <47413> %! ## Same test code as above, but intended only for test statistics on Mac. %! if (! ismac ()), return; endif %! [val, count, msg, pos] = sscanf ("3In2", "%f"); @@ -378,7 +378,7 @@ %! assert (msg, ""); %! assert (pos, 6); -%!xtest <47413> +%!test <47413> %! ## Same test code as above, but intended only for test statistics on Mac. %! if (! ismac ()), return; endif %! [val, count, msg, pos] = sscanf ("3Inf2", "%f");
--- a/test/jit.tst Tue Apr 06 10:43:17 2021 -0400 +++ b/test/jit.tst Tue Apr 06 10:47:40 2021 -0400 @@ -539,7 +539,7 @@ %! assert (b, 1); %! assert (jit_failcnt, 0); -%!xtest <53615> +%!test <53615> %! ## FIXME: No support for functions with complex input prototypes %! if (! __have_feature__ ("ENABLE_JIT")) %! return; @@ -572,7 +572,7 @@ %!shared id %! id = @(x) x; -%!xtest <53615> +%!test <53615> %! ## FIXME: No support for functions with complex input prototypes %! if (! __have_feature__ ("ENABLE_JIT")) %! return;
--- a/test/nest/nest.tst Tue Apr 06 10:43:17 2021 -0400 +++ b/test/nest/nest.tst Tue Apr 06 10:47:40 2021 -0400 @@ -41,7 +41,7 @@ ## worked. The output of "script_nest" is unassigned. This got ## revealed by fixing bug #58686. -%!xtest <*58691> assert (script_nest (), 5) +%!test <*58691> assert (script_nest (), 5) %!assert (arg_ret (), 10)