Mercurial > hg > octave-terminal
changeset 13915:5fa482628bf6
Remove unnecessary regular expression '.*' from ends of %!error blocks
* betainc.cc, chol.cc, dassl.cc, det.cc, eig.cc, find.cc, gcd.cc, hess.cc,
inv.cc, lsode.cc, lu.cc, max.cc, qr.cc, quad.cc, schur.cc, sub2ind.cc, svd.cc,
syl.cc, time.cc, data.cc, mappers.cc, strfns.cc, test_io.m, test_struct.m,
test_system.m: Remove unnecessary regular expression '.*' from ends of
%!error blocks
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Tue, 22 Nov 2011 18:26:28 -0800 |
parents | 4b1ce071f504 |
children | 0ec8413d4bbc |
files | src/DLD-FUNCTIONS/betainc.cc src/DLD-FUNCTIONS/chol.cc src/DLD-FUNCTIONS/dassl.cc src/DLD-FUNCTIONS/det.cc src/DLD-FUNCTIONS/eig.cc src/DLD-FUNCTIONS/find.cc src/DLD-FUNCTIONS/gcd.cc src/DLD-FUNCTIONS/hess.cc src/DLD-FUNCTIONS/inv.cc src/DLD-FUNCTIONS/lsode.cc src/DLD-FUNCTIONS/lu.cc src/DLD-FUNCTIONS/max.cc src/DLD-FUNCTIONS/qr.cc src/DLD-FUNCTIONS/quad.cc src/DLD-FUNCTIONS/schur.cc src/DLD-FUNCTIONS/sub2ind.cc src/DLD-FUNCTIONS/svd.cc src/DLD-FUNCTIONS/syl.cc src/DLD-FUNCTIONS/time.cc src/data.cc src/mappers.cc src/strfns.cc test/test_io.m test/test_struct.m test/test_system.m |
diffstat | 25 files changed, 163 insertions(+), 163 deletions(-) [+] |
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/betainc.cc +++ b/src/DLD-FUNCTIONS/betainc.cc @@ -322,12 +322,12 @@ %! assert(v3, v4, sqrt(eps ('single'))); %% test/octave.test/arith/betainc-2.m -%!error <Invalid call to betainc.*> betainc(); +%!error <Invalid call to betainc> betainc(); %% test/octave.test/arith/betainc-3.m -%!error <Invalid call to betainc.*> betainc(1); +%!error <Invalid call to betainc> betainc(1); %% test/octave.test/arith/betainc-4.m -%!error <Invalid call to betainc.*> betainc(1,2); +%!error <Invalid call to betainc> betainc(1,2); */
--- a/src/DLD-FUNCTIONS/chol.cc +++ b/src/DLD-FUNCTIONS/chol.cc @@ -344,8 +344,8 @@ %!error chol ([1, 2; 3, 4]); %!error chol ([1, 2; 3, 4; 5, 6]); -%!error <Invalid call to chol.*> chol (); -%!error <unexpected second or third input.*> chol (1, 2); +%!error <Invalid call to chol> chol (); +%!error <unexpected second or third input> chol (1, 2); */
--- a/src/DLD-FUNCTIONS/dassl.cc +++ b/src/DLD-FUNCTIONS/dassl.cc @@ -558,6 +558,6 @@ %! dassl_options ("absolute tolerance", eps); %! assert(dassl_options ("absolute tolerance") == eps); -%!error <Invalid call to dassl_options.*> dassl_options ("foo", 1, 2); +%!error <Invalid call to dassl_options> dassl_options ("foo", 1, 2); */
--- a/src/DLD-FUNCTIONS/det.cc +++ b/src/DLD-FUNCTIONS/det.cc @@ -248,8 +248,8 @@ %!assert(det ([1, 2; 3, 4]), -2, 10 * eps); %!assert(det (single([1, 2; 3, 4])), single(-2), 10 * eps ('single')); -%!error <Invalid call to det.*> det (); -%!error <Invalid call to det.*> det (1, 2); +%!error <Invalid call to det> det (); +%!error <Invalid call to det> det (1, 2); %!error det ([1, 2; 3, 4; 5, 6]); */
--- a/src/DLD-FUNCTIONS/eig.cc +++ b/src/DLD-FUNCTIONS/eig.cc @@ -325,8 +325,8 @@ %! assert(A * v(:, 1), d(1, 1) * B * v(:, 1), sqrt (eps)); %! assert(A * v(:, 2), d(2, 2) * B * v(:, 2), sqrt (eps)); -%!error <Invalid call to eig.*> eig (); -%!error <Invalid call to eig.*> eig ([1, 2; 3, 4], [4, 3; 2, 1], 1); +%!error <Invalid call to eig> eig (); +%!error <Invalid call to eig> eig ([1, 2; 3, 4], [4, 3; 2, 1], 1); %!error eig ([1, 2; 3, 4], 2); %!error eig ([1, 2; 3, 4; 5, 6]); %!error eig ("abcd");
--- a/src/DLD-FUNCTIONS/find.cc +++ b/src/DLD-FUNCTIONS/find.cc @@ -617,6 +617,6 @@ %!assert (find ([2 0 1 0 5 0], Inf), [1, 3, 5]) %!assert (find ([2 0 1 0 5 0], Inf, "last"), [1, 3, 5]) -%!error <Invalid call to find.*> find (); +%!error <Invalid call to find> find (); */
--- a/src/DLD-FUNCTIONS/gcd.cc +++ b/src/DLD-FUNCTIONS/gcd.cc @@ -522,7 +522,7 @@ %!assert(gcd (uint64(200), uint64(300), uint64(50), uint64(35)), uint64(5)) %!assert(gcd (18-i, -29+3i), -3-4i) -%!error <Invalid call to gcd.*> gcd (); +%!error <Invalid call to gcd> gcd (); %!test %! s.a = 1;
--- a/src/DLD-FUNCTIONS/hess.cc +++ b/src/DLD-FUNCTIONS/hess.cc @@ -184,8 +184,8 @@ %! [p, h] = hess (a); %! assert(p * h * p', a, sqrt(eps ('single'))); -%!error <Invalid call to hess.*> hess (); -%!error <Invalid call to hess.*> hess ([1, 2; 3, 4], 2); +%!error <Invalid call to hess> hess (); +%!error <Invalid call to hess> hess ([1, 2; 3, 4], 2); %!error hess ([1, 2; 3, 4; 5, 6]); */
--- a/src/DLD-FUNCTIONS/inv.cc +++ b/src/DLD-FUNCTIONS/inv.cc @@ -228,8 +228,8 @@ %!assert(inv ([1, 2; 3, 4]), [-2, 1; 1.5, -0.5], sqrt (eps)) %!assert(inv (single([1, 2; 3, 4])), single([-2, 1; 1.5, -0.5]), sqrt (eps ('single'))) -%!error <Invalid call to inv.*> inv (); -%!error <Invalid call to inv.*> inv ([1, 2; 3, 4], 2); +%!error <Invalid call to inv> inv (); +%!error <Invalid call to inv> inv ([1, 2; 3, 4], 2); %!error inv ([1, 2; 3, 4; 5, 6]); */
--- a/src/DLD-FUNCTIONS/lsode.cc +++ b/src/DLD-FUNCTIONS/lsode.cc @@ -541,6 +541,6 @@ %! lsode_options ("absolute tolerance", eps); %! assert(lsode_options ("absolute tolerance") == eps); -%!error <Invalid call to lsode_options.*> lsode_options ("foo", 1, 2); +%!error <Invalid call to lsode_options> lsode_options ("foo", 1, 2); */
--- a/src/DLD-FUNCTIONS/lu.cc +++ b/src/DLD-FUNCTIONS/lu.cc @@ -580,7 +580,7 @@ %! assert(u, single([5, 6; 0, 4/5]), sqrt (eps('single'))); %! assert(p(:,:), single([0, 0, 1; 1, 0, 0; 0 1 0]), sqrt (eps('single'))); -%!error <Invalid call to lu.*> lu (); +%!error <Invalid call to lu> lu (); %!error lu ([1, 2; 3, 4], 2); */
--- a/src/DLD-FUNCTIONS/max.cc +++ b/src/DLD-FUNCTIONS/max.cc @@ -367,10 +367,10 @@ %!assert(all (min ([4, i; -2, 2]) == [-2, i])); %% test/octave.test/arith/min-3.m -%!error <Invalid call to min.*> min (); +%!error <Invalid call to min> min (); %% test/octave.test/arith/min-4.m -%!error <Invalid call to min.*> min (1, 2, 3, 4); +%!error <Invalid call to min> min (1, 2, 3, 4); %!test %! x = reshape (1:8,[2,2,2]); @@ -446,10 +446,10 @@ %!assert(all (max ([4, i 4.999; -2, 2, 3+4i]) == [4, 2, 3+4i])); %% test/octave.test/arith/max-3.m -%!error <Invalid call to max.*> max (); +%!error <Invalid call to max> max (); %% test/octave.test/arith/max-4.m -%!error <Invalid call to max.*> max (1, 2, 3, 4); +%!error <Invalid call to max> max (1, 2, 3, 4); %!test %! x = reshape (1:8,[2,2,2]);
--- a/src/DLD-FUNCTIONS/qr.cc +++ b/src/DLD-FUNCTIONS/qr.cc @@ -497,8 +497,8 @@ %! assert (q * r, a * p, sqrt (eps)); %! assert (qe * re, a(:, pe), sqrt (eps)); -%!error <Invalid call to qr.*> qr (); -%!error <Invalid call to qr.*> qr ([1, 2; 3, 4], 0, 2); +%!error <Invalid call to qr> qr (); +%!error <Invalid call to qr> qr ([1, 2; 3, 4], 0, 2); %!function retval = testqr (q, r, a, p) %! tol = 100*eps (class(q)); @@ -615,8 +615,8 @@ %! assert (q * r, a * p, sqrt (eps('single'))); %! assert (qe * re, a(:, pe), sqrt (eps('single'))); -%!error <Invalid call to qr.*> qr (); -%!error <Invalid call to qr.*> qr ([1, 2; 3, 4], 0, 2); +%!error <Invalid call to qr> qr (); +%!error <Invalid call to qr> qr ([1, 2; 3, 4], 0, 2); %!test %!
--- a/src/DLD-FUNCTIONS/quad.cc +++ b/src/DLD-FUNCTIONS/quad.cc @@ -494,14 +494,14 @@ %! [v, ier, nfun, err] = quad ("f", single(0.001), single(3)); %! assert((ier == 0 || ier == 1) && abs (v - 1.98194120273598) < sqrt (eps ("single")) && nfun > 0); -%!error <Invalid call to quad.*> quad (); +%!error <Invalid call to quad> quad (); -%!error <Invalid call to quad.*> quad ("f", 1, 2, 3, 4, 5); +%!error <Invalid call to quad> quad ("f", 1, 2, 3, 4, 5); %!test %! quad_options ("absolute tolerance", eps); %! assert(quad_options ("absolute tolerance") == eps); -%!error <Invalid call to quad_options.*> quad_options (1, 2, 3); +%!error <Invalid call to quad_options> quad_options (1, 2, 3); */
--- a/src/DLD-FUNCTIONS/schur.cc +++ b/src/DLD-FUNCTIONS/schur.cc @@ -289,7 +289,7 @@ %!test %! fail("schur ([1, 2; 3, 4], 2)","warning"); -%!error <Invalid call to schur.*> schur (); +%!error <Invalid call to schur> schur (); %!error schur ([1, 2, 3; 4, 5, 6]); */
--- a/src/DLD-FUNCTIONS/sub2ind.cc +++ b/src/DLD-FUNCTIONS/sub2ind.cc @@ -125,9 +125,9 @@ /* # Test input validation -%!error <sub2ind: dimension vector .*> sub2ind([10 10.5], 1, 1); -%!error <subscript indices .*> sub2ind([10 10], 1.5, 1); -%!error <subscript indices .*> sub2ind([10 10], 1, 1.5); +%!error <sub2ind: dimension vector > sub2ind([10 10.5], 1, 1); +%!error <subscript indices > sub2ind([10 10], 1.5, 1); +%!error <subscript indices > sub2ind([10 10], 1, 1.5); # Test evaluation %!shared s1, s2, s3, in @@ -140,9 +140,9 @@ # Test low index %!assert (sub2ind([10 10 10], 1, 1, 1), 1); -%!error <subscript indices .*> sub2ind([10 10 10], 0, 1, 1); -%!error <subscript indices .*> sub2ind([10 10 10], 1, 0, 1); -%!error <subscript indices .*> sub2ind([10 10 10], 1, 1, 0); +%!error <subscript indices > sub2ind([10 10 10], 0, 1, 1); +%!error <subscript indices > sub2ind([10 10 10], 1, 0, 1); +%!error <subscript indices > sub2ind([10 10 10], 1, 1, 0); # Test high index %!assert (sub2ind([10 10 10], 10, 10, 10), 1000);
--- a/src/DLD-FUNCTIONS/svd.cc +++ b/src/DLD-FUNCTIONS/svd.cc @@ -398,9 +398,9 @@ %! assert (size (s), [0, 0]); %! assert (size (v), [0, 0]); -%!error <Invalid call to svd.*> svd (); -%!error <Invalid call to svd.*> svd ([1, 2; 4, 5], 2, 3); -%!error <Invalid call to svd.*> [u, v] = svd ([1, 2; 3, 4]); +%!error <Invalid call to svd> svd (); +%!error <Invalid call to svd> svd ([1, 2; 4, 5], 2, 3); +%!error <Invalid call to svd> [u, v] = svd ([1, 2; 3, 4]); */
--- a/src/DLD-FUNCTIONS/syl.cc +++ b/src/DLD-FUNCTIONS/syl.cc @@ -213,8 +213,8 @@ %!assert(syl ([1, 2; 3, 4], [5, 6; 7, 8], [9, 10; 11, 12]), [-1/2, -2/3; -2/3, -1/2], sqrt (eps)); %!assert(syl (single([1, 2; 3, 4]), single([5, 6; 7, 8]), single([9, 10; 11, 12])), single([-1/2, -2/3; -2/3, -1/2]), sqrt (eps('single'))); -%!error <Invalid call to syl.*> syl (); -%!error <Invalid call to syl.*> syl (1, 2, 3, 4); +%!error <Invalid call to syl> syl (); +%!error <Invalid call to syl> syl (1, 2, 3, 4); %!error syl ([1, 2; 3, 4], [1, 2, 3; 4, 5, 6], [4, 3]); */
--- a/src/DLD-FUNCTIONS/time.cc +++ b/src/DLD-FUNCTIONS/time.cc @@ -186,9 +186,9 @@ %! && isfield (ts, "isdst") %! && isfield (ts, "yday"))); -%!error <Invalid call to gmtime.*> gmtime (); +%!error <Invalid call to gmtime> gmtime (); -%!error <Invalid call to gmtime.*> gmtime (1, 2); +%!error <Invalid call to gmtime> gmtime (1, 2); */ @@ -250,9 +250,9 @@ %! && isfield (ts, "isdst") %! && isfield (ts, "yday"))); -%!error <Invalid call to localtime.*> localtime (); +%!error <Invalid call to localtime> localtime (); -%!error <Invalid call to localtime.*> localtime (1, 2); +%!error <Invalid call to localtime> localtime (1, 2); */ @@ -301,9 +301,9 @@ %! t = time (); %! assert(fix (mktime (localtime (t))) == fix (t)); -%!error <Invalid call to mktime.*> mktime (); +%!error <Invalid call to mktime> mktime (); -%!error <Invalid call to mktime.*> mktime (1, 2, 3); +%!error <Invalid call to mktime> mktime (1, 2, 3); %% These tests fail on systems with mktime functions of limited %% intelligence: @@ -505,9 +505,9 @@ %! && ischar (strftime ("%c%C%d%e%D%h%j", localtime (time ()))) %! && ischar (strftime ("%m%U%w%W%x%y%Y", localtime (time ()))))); -%!error <Invalid call to strftime.*> strftime (); +%!error <Invalid call to strftime> strftime (); -%!error <Invalid call to strftime.*> strftime ("foo", localtime (time ()), 1); +%!error <Invalid call to strftime> strftime ("foo", localtime (time ()), 1); */
--- a/src/data.cc +++ b/src/data.cc @@ -149,8 +149,8 @@ %! && all (x, 1) == [0, 1, 1] %! && all (x, 2) == [0; 1; 1])); -%!error <Invalid call to all.*> all (); -%!error <Invalid call to all.*> all (1, 2, 3); +%!error <Invalid call to all> all (); +%!error <Invalid call to all> all (1, 2, 3); */ @@ -205,8 +205,8 @@ %! && any (x, 1) == [0, 0, 1] %! && any (x, 2) == [0; 0; 1])); -%!error <Invalid call to any.*> any (); -%!error <Invalid call to any.*> any (1, 2, 3); +%!error <Invalid call to any> any (); +%!error <Invalid call to any> any (1, 2, 3); */ @@ -293,8 +293,8 @@ %! x = single([1, 3, 1, 1, 1, 1, 3, 1]); %! assert(atan2 (y, x), v, sqrt (eps('single'))); -%!error <Invalid call to atan2.*> atan2 (); -%!error <Invalid call to atan2.*> atan2 (1, 2, 3); +%!error <Invalid call to atan2> atan2 (); +%!error <Invalid call to atan2> atan2 (1, 2, 3); */ @@ -1079,7 +1079,7 @@ %!assert (cumprod (single([i, 2+i, -3+2i, 4])), single([i, -1+2i, -1-8i, -4-32i])); %!assert (cumprod (single([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])), single([1, 2, 3; i, 4i, 9i; -1+i, -8+8i, -27+27i])); -%!error <Invalid call to cumprod.*> cumprod (); +%!error <Invalid call to cumprod> cumprod (); %!assert (cumprod ([2, 3; 4, 5], 1), [2, 3; 8, 15]); %!assert (cumprod ([2, 3; 4, 5], 2), [2, 6; 4, 20]); @@ -1230,7 +1230,7 @@ %!assert (cumsum (single([i, 2+i, -3+2i, 4])), single([i, 2+2i, -1+4i, 3+4i])); %!assert (cumsum (single([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])), single([1, 2, 3; 1+i, 2+2i, 3+3i; 2+2i, 4+4i, 6+6i])); -%!error <Invalid call to cumsum.*> cumsum (); +%!error <Invalid call to cumsum> cumsum (); %!assert (cumsum ([1, 2; 3, 4], 1), [1, 2; 4, 6]); %!assert (cumsum ([1, 2; 3, 4], 2), [1, 3; 3, 7]); @@ -1342,8 +1342,8 @@ %!assert(diag (int8([0, 0, 0, 0; 1, 0, 0, 0; 0, 2, 0, 0; 0, 0, 3, 0]), -1), int8([1; 2; 3])); %% Test input validation -%!error <Invalid call to diag.*> diag (); -%!error <Invalid call to diag.*> diag (1,2,3,4); +%!error <Invalid call to diag> diag (); +%!error <Invalid call to diag> diag (1,2,3,4); %!error diag (ones (2), 3, 3); %!error diag (1:3, -4, 3); @@ -1373,7 +1373,7 @@ %!assert (prod (single([i, 2+i, -3+2i, 4])), single(-4 - 32i)); %!assert (prod (single([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])), single([-1+i, -8+8i, -27+27i])); -%!error <Invalid call to prod.*> prod (); +%!error <Invalid call to prod> prod (); %!assert (prod ([1, 2; 3, 4], 1), [3, 8]); %!assert (prod ([1, 2; 3, 4], 2), [2; 12]); @@ -2815,7 +2815,7 @@ %!assert(sum (single([i, 2+i, -3+2i, 4])), single(3+4i)); %!assert(sum (single([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])), single([2+2i, 4+4i, 6+6i])); -%!error <Invalid call to sum.*> sum (); +%!error <Invalid call to sum> sum (); %!assert (sum ([1, 2; 3, 4], 1), [4, 6]); %!assert (sum ([1, 2; 3, 4], 2), [3; 7]); @@ -2890,7 +2890,7 @@ %!assert(sumsq (single([-1; -2; 4i])), single(21)); %!assert(sumsq (single([1, 2, 3; 2, 3, 4; 4i, 6i, 2])), single([21, 49, 29])); -%!error <Invalid call to sumsq.*> sumsq (); +%!error <Invalid call to sumsq> sumsq (); %!assert (sumsq ([1, 2; 3, 4], 1), [10, 20]); %!assert (sumsq ([1, 2; 3, 4], 2), [5; 25]); @@ -3402,8 +3402,8 @@ %! s.a = 1; %! assert(ismatrix (s), false); -%!error <Invalid call to ismatrix.*> ismatrix (); -%!error <Invalid call to ismatrix.*> ismatrix ([1, 2; 3, 4], 2); +%!error <Invalid call to ismatrix> ismatrix (); +%!error <Invalid call to ismatrix> ismatrix ([1, 2; 3, 4], 2); */ @@ -4620,7 +4620,7 @@ %!assert (eye(3,'int8'), int8([1, 0, 0; 0, 1, 0; 0, 0, 1])); %!assert (eye(2, 3,'int8'), int8([1, 0, 0; 0, 1, 0])); -%!error <Invalid call to eye.*> eye (1, 2, 3); +%!error <Invalid call to eye> eye (1, 2, 3); */ @@ -4743,8 +4743,8 @@ % assert(linspace ([1, 2; 3, 4], 5, 6), linspace (1, 5, 6)); -%!error <Invalid call to linspace.*> linspace (); -%!error <Invalid call to linspace.*> linspace (1, 2, 3, 4); +%!error <Invalid call to linspace> linspace (); +%!error <Invalid call to linspace> linspace (1, 2, 3, 4); %!test %! fail("linspace ([1, 2; 3, 4], 5, 6)","warning"); @@ -4977,7 +4977,7 @@ %! s.a = 1; %! fail("reshape (s, 2, 3)"); -%!error <Invalid call to reshape.*> reshape (); +%!error <Invalid call to reshape> reshape (); %!error reshape (1, 2, 3, 4); */ @@ -6154,8 +6154,8 @@ %! [v, i] = sort (a); %! assert (i, [1, 4, 2, 5, 3]) -%!error <Invalid call to sort.*> sort (); -%!error <Invalid call to sort.*> sort (1, 2, 3, 4); +%!error <Invalid call to sort> sort (); +%!error <Invalid call to sort> sort (1, 2, 3, 4); */
--- a/src/mappers.cc +++ b/src/mappers.cc @@ -1902,8 +1902,8 @@ DEFALIAS (lower, tolower); /* -%!error <Invalid call to tolower.*> tolower(); -%!error <Invalid call to tolower.*> lower(); +%!error <Invalid call to tolower> tolower(); +%!error <Invalid call to tolower> lower(); %!error tolower (1, 2); %!assert(tolower("OCTAVE"), "octave"); %!assert(tolower("123OCTave!_&"), "123octave!_&"); @@ -1953,8 +1953,8 @@ DEFALIAS (upper, toupper); /* -%!error <Invalid call to toupper.*> toupper(); -%!error <Invalid call to toupper.*> upper(); +%!error <Invalid call to toupper> toupper(); +%!error <Invalid call to toupper> upper(); %!error toupper (1, 2); %!assert(toupper("octave"), "OCTAVE"); %!assert(toupper("123OCTave!_&"), "123OCTAVE!_&");
--- a/src/strfns.cc +++ b/src/strfns.cc @@ -332,8 +332,8 @@ %!assert(ischar ("test"), logical (1)); %!assert(ischar (["test"; "ing"]), logical (1)); %!assert(ischar (struct ("foo", "bar")), logical (0)); -%!error <Invalid call to ischar.*> ischar (); -%!error <Invalid call to ischar.*> ischar ("test", 1); +%!error <Invalid call to ischar> ischar (); +%!error <Invalid call to ischar> ischar ("test", 1); */ static octave_value @@ -589,8 +589,8 @@ } /* -%!error <Invalid call to strcmp.*> strcmp (); -%!error <Invalid call to strcmp.*> strcmp ("foo", "bar", 3); +%!error <Invalid call to strcmp> strcmp (); +%!error <Invalid call to strcmp> strcmp ("foo", "bar", 3); %! %!shared x %! x = char (zeros (0, 2)); @@ -712,8 +712,8 @@ } /* -%!error <Invalid call to strncmp.*> strncmp (); -%!error <Invalid call to strncmp.*> strncmp ("abc", "def"); +%!error <Invalid call to strncmp> strncmp (); +%!error <Invalid call to strncmp> strncmp ("abc", "def"); %!assert (strncmp ("abce", "abc", 3) == 1) %!assert (strncmp (100, 100, 1) == 0) %!assert (all (strncmp ("abce", {"abcd", "bca", "abc"}, 3) == [1, 0, 1])) @@ -922,9 +922,9 @@ } /* -%!error <Invalid call to list_in_columns.*> list_in_columns (); -%!error <Invalid call to list_in_columns.*> list_in_columns (["abc", "def"], 20, 2); -%!error <invalid conversion from string to real scalar.*> list_in_columns (["abc", "def"], "a"); +%!error <Invalid call to list_in_columns> list_in_columns (); +%!error <Invalid call to list_in_columns> list_in_columns (["abc", "def"], 20, 2); +%!error <invalid conversion from string to real scalar> list_in_columns (["abc", "def"], "a"); %!test %! input = {"abc", "def", "ghijkl", "mnop", "qrs", "tuv"}; %! result = "abc mnop\ndef qrs\nghijkl tuv\n";
--- a/test/test_io.m +++ b/test/test_io.m @@ -237,10 +237,10 @@ %!assert(puts (1),-1); %% test/octave.test/io/puts-3.m -%!error <Invalid call to puts.*> puts (); +%!error <Invalid call to puts> puts (); %% test/octave.test/io/puts-4.m -%!error <Invalid call to puts.*> puts (1, 2); +%!error <Invalid call to puts> puts (1, 2); %!assert (sscanf ('123456', '%10c'), '123456') %!assert (sscanf ('123456', '%10s'), '123456') @@ -279,13 +279,13 @@ %! && v2 == [1; 2] && c2 == 2 && ischar (m2))); %% test/octave.test/io/sscanf-2.m -%!error <Invalid call to sscanf.*> sscanf (); +%!error <Invalid call to sscanf> sscanf (); %% test/octave.test/io/sscanf-3.m %!error sscanf (1, 2); %% test/octave.test/io/sscanf-4.m -%!error <Invalid call to sscanf.*> sscanf ("foo", "bar", "C", 1); +%!error <Invalid call to sscanf> sscanf ("foo", "bar", "C", 1); %% test/octave.test/io/sscanf-5.m %!test @@ -310,7 +310,7 @@ %!error printf (1); %% test/octave.test/io/printf-3.m -%!error <Invalid call to printf.*> printf (); +%!error <Invalid call to printf> printf (); %% test/octave.test/io/sprintf-1.m %!test @@ -322,7 +322,7 @@ %!error sprintf (1); %% test/octave.test/io/sprintf-3.m -%!error <Invalid call to sprintf.*> sprintf (); +%!error <Invalid call to sprintf> sprintf (); %% test/octave.test/io/fopen-1.m %!test @@ -393,16 +393,16 @@ %! assert(prog_output_assert("error:.*")); %% test/octave.test/io/fopen-5.m -%!error <Invalid call to fopen.*> fopen (); +%!error <Invalid call to fopen> fopen (); %% test/octave.test/io/fopen-6.m -%!error <Invalid call to fopen.*> fopen ("foo", "wb", "native", 1); +%!error <Invalid call to fopen> fopen ("foo", "wb", "native", 1); %% test/octave.test/io/fclose-1.m %!error fclose (0); %% test/octave.test/io/fclose-2.m -%!error <Invalid call to fclose.*> fclose (1, 2); +%!error <Invalid call to fclose> fclose (1, 2); %% test/octave.test/io/tmpnam-1.m %!assert(ischar (tmpnam ())); @@ -414,7 +414,7 @@ %!warning tmpnam ("foo", 1); %% test/octave.test/io/tmpnam-4.m -%!error <Invalid call to tmpnam.*> tmpnam (1, 2, 3); +%!error <Invalid call to tmpnam> tmpnam (1, 2, 3); %% test/octave.test/io/binary-io-1.m %!test @@ -499,37 +499,37 @@ %! unlink (nm); %% test/octave.test/io/fputs-1.m -%!error <Invalid call to fputs.*> fputs (); +%!error <Invalid call to fputs> fputs (); %% test/octave.test/io/fputs-2.m -%!error <Invalid call to fputs.*> fputs (1, "foo", 1); +%!error <Invalid call to fputs> fputs (1, "foo", 1); %% test/octave.test/io/fputs-3.m %!assert(fputs (1, 1),-1); %% test/octave.test/io/fgetl-1.m -%!error <Invalid call to fgetl.*> fgetl (); +%!error <Invalid call to fgetl> fgetl (); %% test/octave.test/io/fgetl-2.m -%!error <Invalid call to fgetl.*> fgetl (1, 2, 3); +%!error <Invalid call to fgetl> fgetl (1, 2, 3); %% test/octave.test/io/fgetl-3.m %!error fgetl ("foo", 1); %% test/octave.test/io/fgets-1.m -%!error <Invalid call to fgets.*> fgets (); +%!error <Invalid call to fgets> fgets (); %% test/octave.test/io/fgets-2.m -%!error <Invalid call to fgets.*> fgets (1, 2, 3); +%!error <Invalid call to fgets> fgets (1, 2, 3); %% test/octave.test/io/fgets-3.m %!error fgets ("foo", 1); %% test/octave.test/io/fprintf-1.m -%!error <Invalid call to fprintf.*> fprintf (); +%!error <Invalid call to fprintf> fprintf (); %% test/octave.test/io/fprintf-2.m -%!error <Invalid call to fprintf.*> fprintf (1); +%!error <Invalid call to fprintf> fprintf (1); %% test/octave.test/io/fprintf-3.m %!test @@ -543,37 +543,37 @@ %!error fprintf (-1, "foo"); %% test/octave.test/io/fscanf-1.m -%!error <Invalid call to fscanf.*> fscanf (); +%!error <Invalid call to fscanf> fscanf (); %% test/octave.test/io/fscanf-2.m -%!error <Invalid call to fscanf.*> fscanf (1); +%!error <Invalid call to fscanf> fscanf (1); %% test/octave.test/io/fscanf-3.m %!error fscanf ("foo", "bar"); %% test/octave.test/io/fread-1.m -%!error <Invalid call to fread.*> fread (); +%!error <Invalid call to fread> fread (); %% test/octave.test/io/fread-2.m -%!error <Invalid call to fread.*> fread (1, 2, "char", 1, "native", 2); +%!error <Invalid call to fread> fread (1, 2, "char", 1, "native", 2); %% test/octave.test/io/fread-3.m %!error fread ("foo"); %% test/octave.test/io/fwrite-1.m -%!error <Invalid call to fwrite.*> fwrite (); +%!error <Invalid call to fwrite> fwrite (); %% test/octave.test/io/fwrite-2.m -%!error <Invalid call to fwrite.*> fwrite (1, rand (10), "char", 1, "native", 2); +%!error <Invalid call to fwrite> fwrite (1, rand (10), "char", 1, "native", 2); %% test/octave.test/io/fwrite-3.m %!error fwrite ("foo", 1); %% test/octave.test/io/feof-1.m -%!error <Invalid call to feof.*> feof (); +%!error <Invalid call to feof> feof (); %% test/octave.test/io/feof-2.m -%!error <Invalid call to feof.*> feof (1, 2); +%!error <Invalid call to feof> feof (1, 2); %% test/octave.test/io/feof-3.m %!error feof ("foo"); @@ -592,28 +592,28 @@ %!error ferror ("foo"); %% test/octave.test/io/ftell-1.m -%!error <Invalid call to ftell.*> ftell (); +%!error <Invalid call to ftell> ftell (); %% test/octave.test/io/ftell-2.m -%!error <Invalid call to ftell.*> ftell (1, 2); +%!error <Invalid call to ftell> ftell (1, 2); %% test/octave.test/io/ftell-3.m %!error ftell ("foo"); %% test/octave.test/io/fseek-1.m -%!error <Invalid call to fseek.*> fseek (); +%!error <Invalid call to fseek> fseek (); %% test/octave.test/io/fseek-2.m -%!error <Invalid call to fseek.*> fseek (1, 0, SEEK_SET, 1); +%!error <Invalid call to fseek> fseek (1, 0, SEEK_SET, 1); %% test/octave.test/io/fseek-3.m %!error fseek ("foo", 0, SEEK_SET); %% test/octave.test/io/frewind-1.m -%!error <Invalid call to frewind.*> frewind (); +%!error <Invalid call to frewind> frewind (); %% test/octave.test/io/frewind-2.m -%!error <Invalid call to frewind.*> frewind (1, 2); +%!error <Invalid call to frewind> frewind (1, 2); %% test/octave.test/io/frewind-3.m %!error frewind ("foo");
--- a/test/test_struct.m +++ b/test/test_struct.m @@ -29,7 +29,7 @@ %! assert(iscell (c) && strcmp (c{1}, "b")); %% test/octave.test/struct/fieldnames-3.m -%!error <Invalid call to fieldnames.*> fieldnames (); +%!error <Invalid call to fieldnames> fieldnames (); %% test/octave.test/struct/fieldnames-4.m %!test @@ -52,7 +52,7 @@ %! assert(!(isfield (s, "b"))); %% test/octave.test/struct/isfield-3.m -%!error <Invalid call to isfield.*> isfield (); +%!error <Invalid call to isfield> isfield (); %% test/octave.test/struct/isfield-4.m %!test @@ -100,7 +100,7 @@ %! assert(isstruct (s.a)); %% test/octave.test/struct/isstruct-10.m -%!error <Invalid call to isstruct.*> isstruct (); +%!error <Invalid call to isstruct> isstruct (); %% test/octave.test/struct/isstruct-11.m %!test
--- a/test/test_system.m +++ b/test/test_system.m @@ -39,7 +39,7 @@ %! assert(prog_output_assert("ok")); %% test/octave.test/system/pause-2.m -%!error <Invalid call to pause.*> pause (1, 2); +%!error <Invalid call to pause> pause (1, 2); %% test/octave.test/system/sleep-1.m %!test @@ -48,10 +48,10 @@ %! assert(prog_output_assert("ok")); %% test/octave.test/system/sleep-2.m -%!error <Invalid call to sleep.*> sleep (); +%!error <Invalid call to sleep> sleep (); %% test/octave.test/system/sleep-3.m -%!error <Invalid call to sleep.*> sleep (1, 2); +%!error <Invalid call to sleep> sleep (1, 2); %% test/octave.test/system/usleep-1.m %!test @@ -60,10 +60,10 @@ %! assert(prog_output_assert("ok")); %% test/octave.test/system/usleep-2.m -%!error <Invalid call to usleep.*> usleep (); +%!error <Invalid call to usleep> usleep (); %% test/octave.test/system/usleep-3.m -%!error <Invalid call to usleep.*> usleep (1, 2); +%!error <Invalid call to usleep> usleep (1, 2); %% test/octave.test/system/rename-1.m %!test @@ -85,10 +85,10 @@ %! endif %% test/octave.test/system/rename-2.m -%!error <Invalid call to rename.*> rename (); +%!error <Invalid call to rename> rename (); %% test/octave.test/system/rename-3.m -%!error <Invalid call to rename.*> rename ("foo", "bar", 1); +%!error <Invalid call to rename> rename ("foo", "bar", 1); %% test/octave.test/system/unlink-1.m %!test @@ -102,10 +102,10 @@ %! endif %% test/octave.test/system/unlink-2.m -%!error <Invalid call to unlink.*> unlink (); +%!error <Invalid call to unlink> unlink (); %% test/octave.test/system/unlink-3.m -%!error <Invalid call to unlink.*> unlink ("foo", 1); +%!error <Invalid call to unlink> unlink ("foo", 1); %% test/octave.test/system/readdir-1.m %!test @@ -113,10 +113,10 @@ %! assert(iscell (files) && status == 0 && strcmp (msg, "")); %% test/octave.test/system/readdir-2.m -%!error <Invalid call to readdir.*> readdir (); +%!error <Invalid call to readdir> readdir (); %% test/octave.test/system/readdir-3.m -%!error <Invalid call to readdir.*> readdir ("foo", 1); +%!error <Invalid call to readdir> readdir ("foo", 1); %% test/octave.test/system/mk-rm-dir-1.m %!test @@ -128,13 +128,13 @@ %! assert((e1 && strcmp (s2.modestr(1), "d") && e3 && e4 < 0)); %% test/octave.test/system/mkdir-1.m -%!error <Invalid call to mkdir.*> mkdir (); +%!error <Invalid call to mkdir> mkdir (); %% test/octave.test/system/mkdir-2.m -%!error <Invalid call to mkdir.*> mkdir ("foo", 1, 2); +%!error <Invalid call to mkdir> mkdir ("foo", 1, 2); %% test/octave.test/system/rmdir-1.m -%!error <Invalid call to rmdir.*> rmdir (); +%!error <Invalid call to rmdir> rmdir (); %% test/octave.test/system/rmdir-2.m %!test @@ -163,10 +163,10 @@ %! assert(strcmp (s1.modestr, "-rw-rw-rw-") && strcmp (s2.modestr, "----------")); %% test/octave.test/system/umask-2.m -%!error <Invalid call to umask.*> umask (); +%!error <Invalid call to umask> umask (); %% test/octave.test/system/umask-3.m -%!error <Invalid call to umask.*> umask (1, 2); +%!error <Invalid call to umask> umask (1, 2); %% test/octave.test/system/stat-1.m %!test @@ -186,10 +186,10 @@ %! && ischar (msg))); %% test/octave.test/system/stat-2.m -%!error <Invalid call to stat.*> stat (); +%!error <Invalid call to stat> stat (); %% test/octave.test/system/stat-3.m -%!error <Invalid call to stat.*> stat ("foo", 1); +%!error <Invalid call to stat> stat ("foo", 1); %% test/octave.test/system/lstat-1.m %!test @@ -209,10 +209,10 @@ %! && ischar (msg))); %% test/octave.test/system/lstat-2.m -%!error <Invalid call to lstat.*> lstat (); +%!error <Invalid call to lstat> lstat (); %% test/octave.test/system/lstat-3.m -%!error <Invalid call to lstat.*> lstat ("foo", 1); +%!error <Invalid call to lstat> lstat ("foo", 1); %% test/octave.test/system/glob-1.m %!assert(iscell (glob ([filesep "*"]))); @@ -221,7 +221,7 @@ %!error <Invalid call to glob*> glob (); %% test/octave.test/system/glob-3.m -%!error <Invalid call to glob.*> glob ("foo", 1); +%!error <Invalid call to glob> glob ("foo", 1); %% test/octave.test/system/fnmatch-1.m %!test @@ -233,10 +233,10 @@ %! && fnmatch ("x???y", {"xabcy"; "xy"}) == [1; 0])); %% test/octave.test/system/fnmatch-2.m -%!error <Invalid call to fnmatch.*> fnmatch (); +%!error <Invalid call to fnmatch> fnmatch (); %% test/octave.test/system/fnmatch-3.m -%!error <Invalid call to fnmatch.*> fnmatch ("foo", "bar", 3); +%!error <Invalid call to fnmatch> fnmatch ("foo", "bar", 3); %% test/octave.test/system/file_in_path-1.m %!assert(ischar (file_in_path (path (), "date.m"))); @@ -245,10 +245,10 @@ %!error <invalid option> file_in_path ("foo", "bar", 1); %% test/octave.test/system/file_in_path-3.m -%!error <Invalid call to file_in_path.*> file_in_path (); +%!error <Invalid call to file_in_path> file_in_path (); %% test/octave.test/system/file_in_path-4.m -%!error <Invalid call to file_in_path.*> file_in_path ("foo", "bar", "baz", "ooka"); +%!error <Invalid call to file_in_path> file_in_path ("foo", "bar", "baz", "ooka"); %% test/octave.test/system/tilde_expand-1.m %!testif HAVE_GETPWUID @@ -258,10 +258,10 @@ %! && strcmp ("foobar", tilde_expand ("foobar")))); %% test/octave.test/system/tilde_expand-2.m -%!error <Invalid call to tilde_expand.*> tilde_expand (); +%!error <Invalid call to tilde_expand> tilde_expand (); %% test/octave.test/system/tilde_expand-3.m -%!error <Invalid call to tilde_expand.*> tilde_expand ("str", 2); +%!error <Invalid call to tilde_expand> tilde_expand ("str", 2); %% test/octave.test/system/getpgrp-1.m %!testif HAVE_GETPGRP @@ -311,10 +311,10 @@ %!assert(strcmp (getenv ("HOME"), tilde_expand ("~"))); %% test/octave.test/system/getenv-2.m -%!error <Invalid call to getenv.*> getenv (); +%!error <Invalid call to getenv> getenv (); %% test/octave.test/system/getenv-3.m -%!error <Invalid call to getenv.*> getenv ("foo", 1); +%!error <Invalid call to getenv> getenv ("foo", 1); %% test/octave.test/system/getenv-4.m %!test @@ -329,10 +329,10 @@ %! assert(strcmp (getenv ("foobar"), "baz")); %% test/octave.test/system/putenv-2.m -%!error <Invalid call to putenv.*> putenv (); +%!error <Invalid call to putenv> putenv (); %% test/octave.test/system/putenv-3.m -%!error <Invalid call to putenv.*> putenv ("foo", "bar", 1); +%!error <Invalid call to putenv> putenv ("foo", "bar", 1); %% test/octave.test/system/putenv-4.m %!test @@ -377,7 +377,7 @@ %! && isfield (s, "shell"))); %% test/octave.test/system/getpwent-2.m -%!error <Invalid call to getpwent.*> getpwent (1); +%!error <Invalid call to getpwent> getpwent (1); %% test/octave.test/system/getpwuid-1.m %!testif HAVE_GETPWUID @@ -387,10 +387,10 @@ %! assert(strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid); %% test/octave.test/system/getpwuid-2.m -%!error <Invalid call to getpwuid.*> getpwuid (); +%!error <Invalid call to getpwuid> getpwuid (); %% test/octave.test/system/getpwuid-3.m -%!error <Invalid call to getpwuid.*> getpwuid (1, 2); +%!error <Invalid call to getpwuid> getpwuid (1, 2); %% test/octave.test/system/getpwnam-1.m %!testif HAVE_GETPWNAM @@ -400,10 +400,10 @@ %! assert(strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid); %% test/octave.test/system/getpwnam-2.m -%!error <Invalid call to getpwnam.*> getpwnam (); +%!error <Invalid call to getpwnam> getpwnam (); %% test/octave.test/system/getpwnam-3.m -%!error <Invalid call to getpwnam.*> getpwnam ("foo", 1); +%!error <Invalid call to getpwnam> getpwnam ("foo", 1); %% test/octave.test/system/setpwent-1.m %!testif HAVE_SETPWENT @@ -414,10 +414,10 @@ %! assert(strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid); %% test/octave.test/system/setpwent-2.m -%!error <Invalid call to setpwent.*> setpwent (1); +%!error <Invalid call to setpwent> setpwent (1); %% test/octave.test/system/endpwent-1.m -%!error <Invalid call to endpwent.*> endpwent (1); +%!error <Invalid call to endpwent> endpwent (1); %% test/octave.test/system/getgrent-1.m %!testif HAVE_GETGRENT @@ -430,7 +430,7 @@ %! && isfield (x, "mem"))); %% test/octave.test/system/getgrent-2.m -%!error <Invalid call to getgrent.*> getgrent (1); +%!error <Invalid call to getgrent> getgrent (1); %% test/octave.test/system/getgrgid-1.m %!testif HAVE_GETGRGID @@ -440,10 +440,10 @@ %! assert(strcmp (x.name, y.name) && x.gid == y.gid); %% test/octave.test/system/getgrgid-2.m -%!error <Invalid call to getgrgid.*> getgrgid (); +%!error <Invalid call to getgrgid> getgrgid (); %% test/octave.test/system/getgrgid-3.m -%!error <Invalid call to getgrgid.*> getgrgid (1, 2); +%!error <Invalid call to getgrgid> getgrgid (1, 2); %% test/octave.test/system/getgrnam-1.m %!testif HAVE_GETGRNAM @@ -453,10 +453,10 @@ %! assert(strcmp (x.name, y.name) && x.gid == y.gid); %% test/octave.test/system/getgrnam-2.m -%!error <Invalid call to getgrnam.*> getgrnam (); +%!error <Invalid call to getgrnam> getgrnam (); %% test/octave.test/system/getgrnam-3.m -%!error <Invalid call to getgrnam.*> getgrnam ("foo", 1); +%!error <Invalid call to getgrnam> getgrnam ("foo", 1); %% test/octave.test/system/setgrent-1.m %!testif HAVE_SETGRENT @@ -467,10 +467,10 @@ %! assert(strcmp (x.name, y.name) && x.gid == y.gid); %% test/octave.test/system/setgrent-2.m -%!error <Invalid call to setgrent.*> setgrent (1); +%!error <Invalid call to setgrent> setgrent (1); %% test/octave.test/system/endgrent-1.m -%!error <Invalid call to endgrent.*> endgrent (1); +%!error <Invalid call to endgrent> endgrent (1); %% test/octave.test/system/isieee-1.m %!assert(isieee () == 1 || isieee () == 0);