# HG changeset patch
# User jwe
# Date 1144783929 0
# Node ID 02c7e288f5811528c2267e37a6a216b88eefa159
# Parent  bd9cd65d51e418c87e9668c1c1b5795b0803509b
[project @ 2006-04-11 19:32:09 by jwe]

diff --git a/test/ChangeLog b/test/ChangeLog
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-11  John W. Eaton  <jwe@octave.org>
+
+	* test_system.m, test_struct.m, test_string.m, test_quad.m,
+	test_number.m, test_nonlin.m, test_matrix.m, test_linalg.m,
+	test_io.m, test_diffeq.m, test_arith.m: Update for new usage
+	message format.
+
 2006-04-03  David Bateman  <dbateman@free.fr>
 
 	* test_number.m: Reverse sense of isscalar and isvector tests
diff --git a/test/test_arith.m b/test/test_arith.m
--- a/test/test_arith.m
+++ b/test/test_arith.m
@@ -27,13 +27,13 @@
 %! assert(all(abs(v1-v2)<sqrt(eps)) && all(abs(v3-v4)<sqrt(eps)));
 
 %% test/octave.test/arith/betainc-2.m
-%!error <... betainc:.*> betainc();
+%!error <Invalid call to betainc.*> betainc();
 
 %% test/octave.test/arith/betainc-3.m
-%!error <... betainc:.*> betainc(1);
+%!error <Invalid call to betainc.*> betainc(1);
 
 %% test/octave.test/arith/betainc-4.m
-%!error <... betainc:.*> betainc(1,2);
+%!error <Invalid call to betainc.*> betainc(1,2);
 
 %% test/octave.test/arith/ceil-1.m
 %!assert(all (ceil ([2, 1.1, -1.1, -1]) == [2, 2, -1, -1]));
@@ -124,7 +124,7 @@
 %! && gcd ([200, 300, 50, 35]) == 5));
 
 %% test/octave.test/arith/gcd-2.m
-%!error <... gcd:.*> gcd ();
+%!error <Invalid call to gcd.*> gcd ();
 
 %% test/octave.test/arith/gcd-3.m
 %!test
@@ -149,10 +149,10 @@
 %!assert(all (max ([4, i 4.999; -2, 2, 3+4i]) == [4, 2, 3+4i]));
 
 %% test/octave.test/arith/max-3.m
-%!error <... max:.*> max ();
+%!error <Invalid call to max.*> max ();
 
 %% test/octave.test/arith/max-4.m
-%!error <... max:.*> max (1, 2, 3, 4);
+%!error <Invalid call to max.*> max (1, 2, 3, 4);
 
 %% test/octave.test/arith/min-1.m
 %!assert(min ([1, 4, 2, 3]) == 1 && min ([1; -10; 5; -2]) == -10);
@@ -161,10 +161,10 @@
 %!assert(all (min ([4, i; -2, 2]) == [-2, i]));
 
 %% test/octave.test/arith/min-3.m
-%!error <... min:.*> min ();
+%!error <Invalid call to min.*> min ();
 
 %% test/octave.test/arith/min-4.m
-%!error <... min:.*> min (1, 2, 3, 4);
+%!error <Invalid call to min.*> min (1, 2, 3, 4);
 
 %% test/octave.test/arith/pow2-1.m
 %!test
@@ -684,10 +684,10 @@
 %! );
 
 %% test/octave.test/arith/atan2-2.m
-%!error <... atan2:.*> atan2 ();
+%!error <Invalid call to atan2.*> atan2 ();
 
 %% test/octave.test/arith/atan2-3.m
-%!error <... atan2:.*> atan2 (1, 2, 3);
+%!error <Invalid call to atan2.*> atan2 (1, 2, 3);
 
 %% test/octave.test/arith/sum-1.m
 %!assert((sum ([1, 2, 3]) == 6 && sum ([-1; -2; -3]) == -6
@@ -697,7 +697,7 @@
 %!assert(all (all (sum ([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i]) == [2+2i, 4+4i, 6+6i])));
 
 %% test/octave.test/arith/sum-3.m
-%!error <... sum:.*> sum ();
+%!error <Invalid call to sum.*> sum ();
 
 %% test/octave.test/arith/sum-4.m
 %!assert((all (sum ([1, 2; 3, 4], 1) == [4, 6])
@@ -724,7 +724,7 @@
 %! == [-1+i, -8+8i, -27+27i])));
 
 %% test/octave.test/arith/prod-3.m
-%!error <... prod:.*> prod ();
+%!error <Invalid call to prod.*> prod ();
 
 %% test/octave.test/arith/prod-4.m
 %!assert((all (prod ([1, 2; 3, 4], 1) == [3, 8])
@@ -751,7 +751,7 @@
 %! == [1, 2, 3; 1+i, 2+2i, 3+3i; 2+2i, 4+4i, 6+6i])));
 
 %% test/octave.test/arith/cumsum-3.m
-%!error <... cumsum:.*> cumsum ();
+%!error <Invalid call to cumsum.*> cumsum ();
 
 %% test/octave.test/arith/cumsum-4.m
 %!assert((all (cumsum ([1, 2; 3, 4], 1) == [1, 2; 4, 6])
@@ -766,7 +766,7 @@
 %! == [1, 2, 3; i, 4i, 9i; -1+i, -8+8i, -27+27i])));
 
 %% test/octave.test/arith/cumprod-3.m
-%!error <... cumprod:.*> cumprod ();
+%!error <Invalid call to cumprod.*> cumprod ();
 
 %% test/octave.test/arith/cumprod-4.m
 %!assert((all (cumprod ([2, 3; 4, 5], 1) == [2, 3; 8, 15])
@@ -779,7 +779,7 @@
 %!assert(all (all (sumsq ([1, 2, 3; 2, 3, 4; 4i, 6i, 2]) == [21, 49, 29])));
 
 %% test/octave.test/arith/sumsq-3.m
-%!error <... sumsq:.*> sumsq ();
+%!error <Invalid call to sumsq.*> sumsq ();
 
 %% test/octave.test/arith/sumsq-4.m
 %!assert((all (sumsq ([1, 2; 3, 4], 1) == [10, 20])
diff --git a/test/test_diffeq.m b/test/test_diffeq.m
--- a/test/test_diffeq.m
+++ b/test/test_diffeq.m
@@ -71,10 +71,10 @@
 %! assert(lsode_options ("absolute tolerance") == eps);
 
 %% test/octave.test/diffeq/lsode_options-2.m
-%!error <... lsode_options:.*> lsode_options ();
+%!error <Invalid call to lsode_options.*> lsode_options ();
 
 %% test/octave.test/diffeq/lsode_options-3.m
-%!error <... lsode_options:.*> lsode_options ("foo", 1, 2);
+%!error <Invalid call to lsode_options.*> lsode_options ("foo", 1, 2);
 
 %% test/octave.test/diffeq/dassl-1.m
 %% dassl-1.m
@@ -155,8 +155,8 @@
 %! assert(dassl_options ("absolute tolerance") == eps);
 
 %% test/octave.test/diffeq/dassl_options-2.m
-%!error <... dassl_options:.*> dassl_options ();
+%!error <Invalid call to dassl_options.*> dassl_options ();
 
 %% test/octave.test/diffeq/dassl_options-3.m
-%!error <... dassl_options:.*> dassl_options ("foo", 1, 2);
+%!error <Invalid call to dassl_options.*> dassl_options ("foo", 1, 2);
 
diff --git a/test/test_io.m b/test/test_io.m
--- a/test/test_io.m
+++ b/test/test_io.m
@@ -199,10 +199,10 @@
 %!assert(puts (1),-1);
 
 %% test/octave.test/io/puts-3.m
-%!error <... puts:.*> puts ();
+%!error <Invalid call to puts.*> puts ();
 
 %% test/octave.test/io/puts-4.m
-%!error <... puts:.*> puts (1, 2);
+%!error <Invalid call to puts.*> puts (1, 2);
 
 %% test/octave.test/io/sscanf-1.m
 %!test
@@ -215,13 +215,13 @@
 %! && v2 == [1; 2] && c2 == 2 && isstr (m2)));
 
 %% test/octave.test/io/sscanf-2.m
-%!error <... 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 <... sscanf:.*> sscanf ("foo", "bar", "C", 1);
+%!error <Invalid call to sscanf.*> sscanf ("foo", "bar", "C", 1);
 
 %% test/octave.test/io/sscanf-5.m
 %!test
@@ -246,7 +246,7 @@
 %!error printf (1);
 
 %% test/octave.test/io/printf-3.m
-%!error <... printf:.*> printf ();
+%!error <Invalid call to printf.*> printf ();
 
 %% test/octave.test/io/sprintf-1.m
 %!test
@@ -258,7 +258,7 @@
 %!error sprintf (1);
 
 %% test/octave.test/io/sprintf-3.m
-%!error <... sprintf:.*> sprintf ();
+%!error <Invalid call to sprintf.*> sprintf ();
 
 %% test/octave.test/io/fopen-1.m
 %!test
@@ -329,16 +329,16 @@
 %! assert(prog_output_assert("error:.*"));
 
 %% test/octave.test/io/fopen-5.m
-%!error <... fopen:.*> fopen ();
+%!error <Invalid call to fopen.*> fopen ();
 
 %% test/octave.test/io/fopen-6.m
-%!error <... 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 <... fclose:.*> fclose (1, 2);
+%!error <Invalid call to fclose.*> fclose (1, 2);
 
 %% test/octave.test/io/tmpnam-1.m
 %!assert(isstr (tmpnam ()));
@@ -350,7 +350,7 @@
 %!warning tmpnam ("foo", 1);
 
 %% test/octave.test/io/tmpnam-4.m
-%!error <... tmpnam:.*> tmpnam (1, 2, 3);
+%!error <Invalid call to tmpnam.*> tmpnam (1, 2, 3);
 
 %% test/octave.test/io/binary-io-1.m
 %!test
@@ -435,42 +435,42 @@
 %! unlink (nm);
 
 %% test/octave.test/io/fputs-1.m
-%!error <... fputs:.*> fputs ();
+%!error <Invalid call to fputs.*> fputs ();
 
 %% test/octave.test/io/fputs-2.m
-%!error <... 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 <... fgetl:.*> fgetl ();
+%!error <Invalid call to fgetl.*> fgetl ();
 
 %% test/octave.test/io/fgetl-2.m
-%!error <... 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 <... fgets:.*> fgets ();
+%!error <Invalid call to fgets.*> fgets ();
 
 %% test/octave.test/io/fgets-2.m
-%!error <... 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 <... fprintf:.*> fprintf ();
+%!error <Invalid call to fprintf.*> fprintf ();
 
 %% test/octave.test/io/fprintf-2.m
-%!error <... fprintf:.*> fprintf (1);
+%!error <Invalid call to fprintf.*> fprintf (1);
 
 %% test/octave.test/io/fprintf-3.m
 %!test
 %! s.a = 1;
-%! fail("fprintf (s)","... fprintf:.*");
+%! fail("fprintf (s)","Invalid call to fprintf.*");
 
 %% test/octave.test/io/fprintf-4.m
 %!error fprintf (1, 1);
@@ -479,37 +479,37 @@
 %!error fprintf (-1, "foo");
 
 %% test/octave.test/io/fscanf-1.m
-%!error <... fscanf:.*> fscanf ();
+%!error <Invalid call to fscanf.*> fscanf ();
 
 %% test/octave.test/io/fscanf-2.m
-%!error <... 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 <... fread:.*> fread ();
+%!error <Invalid call to fread.*> fread ();
 
 %% test/octave.test/io/fread-2.m
-%!error <... 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 <... fwrite:.*> fwrite ();
+%!error <Invalid call to fwrite.*> fwrite ();
 
 %% test/octave.test/io/fwrite-2.m
-%!error <... 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 <... feof:.*> feof ();
+%!error <Invalid call to feof.*> feof ();
 
 %% test/octave.test/io/feof-2.m
-%!error <... feof:.*> feof (1, 2);
+%!error <Invalid call to feof.*> feof (1, 2);
 
 %% test/octave.test/io/feof-3.m
 %!error feof ("foo");
@@ -518,38 +518,38 @@
 %% So use fail for the next two tests instead.
 %% test/octave.test/io/ferror-1.m
 %!test
-%! fail("ferror ();","... ferror:.*");
+%! fail("ferror ();","Invalid call to ferror.*");
 
 %% test/octave.test/io/ferror-2.m
 %!test
-%! fail("ferror (1, \"clear\", 2);","... ferror:.*"); 
+%! fail("ferror (1, \"clear\", 2);","Invalid call to ferror.*"); 
 
 %% test/octave.test/io/ferror-3.m
 %!error ferror ("foo");
 
 %% test/octave.test/io/ftell-1.m
-%!error <... ftell:.*> ftell ();
+%!error <Invalid call to ftell.*> ftell ();
 
 %% test/octave.test/io/ftell-2.m
-%!error <... 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 <... fseek:.*> fseek ();
+%!error <Invalid call to fseek.*> fseek ();
 
 %% test/octave.test/io/fseek-2.m
-%!error <... 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 <... frewind:.*> frewind ();
+%!error <Invalid call to frewind.*> frewind ();
 
 %% test/octave.test/io/frewind-2.m
-%!error <... frewind:.*> frewind (1, 2);
+%!error <Invalid call to frewind.*> frewind (1, 2);
 
 %% test/octave.test/io/frewind-3.m
 %!error frewind ("foo");
diff --git a/test/test_linalg.m b/test/test_linalg.m
--- a/test/test_linalg.m
+++ b/test/test_linalg.m
@@ -16,10 +16,10 @@
 %!assert(det ([1, 2; 3, 4]) == -2);
 
 %% test/octave.test/linalg/det-2.m
-%!error <... det:.*> det ();
+%!error <Invalid call to det.*> det ();
 
 %% test/octave.test/linalg/det-3.m
-%!error <... det:.*> det (1, 2);
+%!error <Invalid call to det.*> det (1, 2);
 
 %% test/octave.test/linalg/det-4.m
 %!error det ([1, 2; 3, 4; 5, 6]);
@@ -35,10 +35,10 @@
 %! && (abs (v - [-x, x; x, x]) < sqrt (eps))));
 
 %% test/octave.test/linalg/eig-3.m
-%!error <... eig:.*> eig ();
+%!error <Invalid call to eig.*> eig ();
 
 %% test/octave.test/linalg/eig-4.m
-%!error <... eig:.*> eig ([1, 2; 3, 4], 2);
+%!error <Invalid call to eig.*> eig ([1, 2; 3, 4], 2);
 
 %% test/octave.test/linalg/eig-5.m
 %!error eig ([1, 2; 3, 4; 5, 6]);
@@ -67,20 +67,20 @@
 %! assert(all (all (expm (arg) == result)));
 
 %% test/octave.test/linalg/expm-4.m
-%!error <expm:> expm();
+%!error <Invalid call to expm.*> expm();
 
 %% test/octave.test/linalg/expm-5.m
-%!error <expm:> expm(1,2);
+%!error <Invalid call to expm.*> expm(1,2);
 
 %% test/octave.test/linalg/expm-6.m
 %% test/octave.test/linalg/inv-1.m
 %!assert(all (all (abs (inv ([1, 2; 3, 4]) - [-2, 1; 1.5, -0.5]) < sqrt (eps))));
 
 %% test/octave.test/linalg/inv-2.m
-%!error <... inv:.*> inv ();
+%!error <Invalid call to inv.*> inv ();
 
 %% test/octave.test/linalg/inv-3.m
-%!error <... inv:.*> inv ([1, 2; 3, 4], 2);
+%!error <Invalid call to inv.*> inv ([1, 2; 3, 4], 2);
 
 %% test/octave.test/linalg/inv-4.m
 %!error inv ([1, 2; 3, 4; 5, 6]);
@@ -112,10 +112,10 @@
 %!error chol ([1, 2; 3, 4; 5, 6]);
 
 %% test/octave.test/linalg/chol-4.m
-%!error <... chol:.*> chol ();
+%!error <Invalid call to chol.*> chol ();
 
 %% test/octave.test/linalg/chol-5.m
-%!error <... chol:.*> chol (1, 2);
+%!error <Invalid call to chol.*> chol (1, 2);
 
 %% test/octave.test/linalg/hess-1.m
 %!test
@@ -124,10 +124,10 @@
 %! assert(size (p) == [3, 3] && size (h) == [3, 3] && abs (a - p * h * p') < sqrt (eps));
 
 %% test/octave.test/linalg/hess-2.m
-%!error <... hess:.*> hess ();
+%!error <Invalid call to hess.*> hess ();
 
 %% test/octave.test/linalg/hess-3.m
-%!error <... hess:.*> hess ([1, 2; 3, 4], 2);
+%!error <Invalid call to hess.*> hess ([1, 2; 3, 4], 2);
 
 %% test/octave.test/linalg/hess-4.m
 %!error hess ([1, 2; 3, 4; 5, 6]);
@@ -149,10 +149,10 @@
 %! && abs (p - [0, 1; 1, 0]) < sqrt (eps)));
 
 %% test/octave.test/linalg/lu-4.m
-%!error <... lu:.*> lu ();
+%!error <Invalid call to lu.*> lu ();
 
 %% test/octave.test/linalg/lu-5.m
-%!error <... lu:.*> lu ([1, 2; 3, 4], 2);
+%!error <Invalid call to lu.*> lu ([1, 2; 3, 4], 2);
 
 %% test/octave.test/linalg/lu-6.m
 %!test
@@ -214,10 +214,10 @@
 %! && abs (a(:,pe) - qe * re) < sqrt (eps)));
 
 %% test/octave.test/linalg/qr-5.m
-%!error <... qr:.*> qr ();
+%!error <Invalid call to qr.*> qr ();
 
 %% test/octave.test/linalg/qr-6.m
-%!error <... qr:.*> qr ([1, 2; 3, 4], 0, 2);
+%!error <Invalid call to qr.*> qr ([1, 2; 3, 4], 0, 2);
 
 %% test/octave.test/linalg/qr-7.m
 %!function retval = testqr (q, r, a, p)
@@ -302,7 +302,7 @@
 %! assert(size (u) == [3, 3] && size (s) == [3, 3] && abs (s - u' * a * u) < sqrt (eps));
 
 %% test/octave.test/linalg/schur-2.m
-%!error <... schur:.*> schur ();
+%!error <Invalid call to schur.*> schur ();
 
 %% test/octave.test/linalg/schur-3.m
 %!test
@@ -352,13 +352,13 @@
 %! && abs (a - u * s * v') < sqrt (eps)));
 
 %% test/octave.test/linalg/svd-7.m
-%!error <... svd:.*> svd ();
+%!error <Invalid call to svd.*> svd ();
 
 %% test/octave.test/linalg/svd-8.m
-%!error <... svd:.*> svd ([1, 2; 4, 5], 2, 3);
+%!error <Invalid call to svd.*> svd ([1, 2; 4, 5], 2, 3);
 
 %% test/octave.test/linalg/svd-9.m
-%!error <... svd:.*> [u, v] = svd ([1, 2; 3, 4]);
+%!error <Invalid call to svd.*> [u, v] = svd ([1, 2; 3, 4]);
 
 %% test/octave.test/linalg/syl-1.m
 %!test
@@ -366,10 +366,10 @@
 %! assert(all (all (abs (x - [-1/2, -2/3; -2/3, -1/2]) < sqrt (eps))));
 
 %% test/octave.test/linalg/syl-2.m
-%!error <... syl:.*> syl ();
+%!error <Invalid call to syl.*> syl ();
 
 %% test/octave.test/linalg/syl-3.m
-%!error <... syl:.*> syl (1, 2, 3, 4);
+%!error <Invalid call to syl.*> syl (1, 2, 3, 4);
 
 %% test/octave.test/linalg/syl-4.m
 %!error syl ([1, 2; 3, 4], [1, 2, 3; 4, 5, 6], [4, 3]);
diff --git a/test/test_matrix.m b/test/test_matrix.m
--- a/test/test_matrix.m
+++ b/test/test_matrix.m
@@ -10,10 +10,10 @@
 %! && all (x, 2) == [0; 1; 1]));
 
 %% test/octave.test/matrix/all-2.m
-%!error <... all:.*> all ();
+%!error <Invalid call to all.*> all ();
 
 %% test/octave.test/matrix/all-3.m
-%!error <... all:.*> all (1, 2, 3);
+%!error <Invalid call to all.*> all (1, 2, 3);
 
 %% test/octave.test/matrix/any-1.m
 %!test
@@ -25,10 +25,10 @@
 %! && any (x, 2) == [0; 0; 1]));
 
 %% test/octave.test/matrix/any-2.m
-%!error <... any:.*> any ();
+%!error <Invalid call to any.*> any ();
 
 %% test/octave.test/matrix/any-3.m
-%!error <... any:.*> any (1, 2, 3);
+%!error <Invalid call to any.*> any (1, 2, 3);
 
 %% test/octave.test/matrix/diff-1.m
 %!assert((diff ([1, 2, 3, 4]) == [1, 1, 1]
@@ -61,10 +61,10 @@
 %! assert(i == [3; 2; 1] && j == [1; 2; 3] && v == [-1; 3; 2]);
 
 %% test/octave.test/matrix/find-3.m
-%!error <... find:.*> find ();
+%!error <Invalid call to find.*> find ();
 
 %% test/octave.test/matrix/find-4.m
-%!error <... find:.*> find (1, 2);
+%!error <Invalid call to find.*> find (1, 2);
 
 %% test/octave.test/matrix/fliplr-1.m
 %!assert((fliplr ([1, 2; 3, 4]) == [2, 1; 4, 3]
@@ -120,7 +120,7 @@
 %! fail("reshape (s, 2, 3)");
 
 %% test/octave.test/matrix/reshape-3.m
-%!error <... reshape:.*> reshape ();
+%!error <Invalid call to reshape.*> reshape ();
 
 %% test/octave.test/matrix/reshape-4.m
 %!error reshape (1, 2, 3, 4);
@@ -155,10 +155,10 @@
 %! assert(sort (a) == s && xs == s && xi == i);
 
 %% test/octave.test/matrix/sort-2.m
-%!error <... sort:.*> sort ();
+%!error <Invalid call to sort.*> sort ();
 
 %% test/octave.test/matrix/sort-3.m
-%!error <... sort:.*> sort (1, 2, 3, 4);
+%!error <Invalid call to sort.*> sort (1, 2, 3, 4);
 
 %% test/octave.test/matrix/tril-1.m
 %!test
@@ -230,7 +230,7 @@
 %! && eye (2, 3) == i23 && eye (3, 2) == i23'));
 
 %% test/octave.test/matrix/eye-2.m
-%!error <... eye:.*> eye (1, 2, 3);
+%!error <Invalid call to eye.*> eye (1, 2, 3);
 
 %% test/octave.test/matrix/ones-1.m
 %!test
@@ -309,10 +309,10 @@
 %! && diag (d0) == d && diag (d1, 1) == d && diag (dm1, -1) == d));
 
 %% test/octave.test/matrix/diag-2.m
-%!error <... diag:.*> diag ();
+%!error <Invalid call to diag.*> diag ();
 
 %% test/octave.test/matrix/diag-3.m
-%!error <... diag:.*> diag (1, 2, 3);
+%!error <Invalid call to diag.*> diag (1, 2, 3);
 
 %% test/octave.test/matrix/linspace-1.m
 %!test
@@ -329,10 +329,10 @@
 %! assert(all (linspace ([1, 2; 3, 4], 5, 6) == linspace (1, 5, 6)));
 
 %% test/octave.test/matrix/linspace-3.m
-%!error <... linspace:.*> linspace ();
+%!error <Invalid call to linspace.*> linspace ();
 
 %% test/octave.test/matrix/linspace-4.m
-%!error <... linspace:.*> linspace (1, 2, 3, 4);
+%!error <Invalid call to linspace.*> linspace (1, 2, 3, 4);
 
 %% test/octave.test/matrix/linspace-5.m
 %!test
diff --git a/test/test_nonlin.m b/test/test_nonlin.m
--- a/test/test_nonlin.m
+++ b/test/test_nonlin.m
@@ -81,8 +81,8 @@
 %! assert(fsolve_options ("tolerance") == eps);
 
 %% test/octave.test/nonlin/fsolve_options-2.m
-%!error <... fsolve_options:.*> fsolve_options ();
+%!error <Invalid call to fsolve_options.*> fsolve_options ();
 
 %% test/octave.test/nonlin/fsolve_options-3.m
-%!error <... fsolve_options:.*> fsolve_options ("foo", 1, 2);
+%!error <Invalid call to fsolve_options.*> fsolve_options ("foo", 1, 2);
 
diff --git a/test/test_number.m b/test/test_number.m
--- a/test/test_number.m
+++ b/test/test_number.m
@@ -35,10 +35,10 @@
 %! assert(!(ismatrix (s)));
 
 %% test/octave.test/number/ismatrix-9.m
-%!error <... ismatrix:.*> ismatrix ();
+%!error <Invalid call to ismatrix.*> ismatrix ();
 
 %% test/octave.test/number/ismatrix-10.m
-%!error <... ismatrix:.*> ismatrix ([1, 2; 3, 4], 2);
+%!error <Invalid call to ismatrix.*> ismatrix ([1, 2; 3, 4], 2);
 
 %% test/octave.test/number/isvector-1.m
 %!assert(isvector (1));
diff --git a/test/test_quad.m b/test/test_quad.m
--- a/test/test_quad.m
+++ b/test/test_quad.m
@@ -16,10 +16,10 @@
 %! assert((ier == 0 || ier == 1) && abs (v - 1.98194122455795) < sqrt (eps) && nfun > 0);
 
 %% test/octave.test/quad/quad-3.m
-%!error <... quad:.*> quad ();
+%!error <Invalid call to quad.*> quad ();
 
 %% test/octave.test/quad/quad-4.m
-%!error <... quad:.*> quad ("f", 1, 2, 3, 4, 5);
+%!error <Invalid call to quad.*> quad ("f", 1, 2, 3, 4, 5);
 
 %% test/octave.test/quad/quad_options-1.m
 %!test
@@ -27,8 +27,8 @@
 %! assert(quad_options ("absolute tolerance") == eps);
 
 %% test/octave.test/quad/quad_options-2.m
-%!error <... quad_options:.*> quad_options ();
+%!error <Invalid call to quad_options.*> quad_options ();
 
 %% test/octave.test/quad/quad_options-3.m
-%!error <... quad_options:.*> quad_options (1, 2, 3);
+%!error <Invalid call to quad_options.*> quad_options (1, 2, 3);
 
diff --git a/test/test_string.m b/test/test_string.m
--- a/test/test_string.m
+++ b/test/test_string.m
@@ -141,10 +141,10 @@
 %! assert(!(ischar (s)));
 
 %% test/octave.test/string/ischar-10.m
-%!error <... ischar:.*> ischar ();
+%!error <Invalid call to ischar.*> ischar ();
 
 %% test/octave.test/string/ischar-11.m
-%!error <... ischar:.*> ischar ("test", 1);
+%!error <Invalid call to ischar.*> ischar ("test", 1);
 
 %% test/octave.test/string/blanks-1.m
 %!assert(strcmp (blanks (3), "   "));
@@ -159,7 +159,7 @@
 %!assert(strcmp (char ([65, 83, 67, 73, 73]), "ASCII"));
 
 %% test/octave.test/string/char-2.m
-%!error <... char:.*> char ();
+%!error <Invalid call to char.*> char ();
 
 %% test/octave.test/string/char-3.m
 %!test
@@ -281,10 +281,10 @@
 %!assert(strcmp ("foobar", "foobar") && strcmp ("fooba", "foobar") == 0);
 
 %% test/octave.test/string/strcmp-2.m
-%!error <... strcmp:.*> strcmp ();
+%!error <Invalid call to strcmp.*> strcmp ();
 
 %% test/octave.test/string/strcmp-3.m
-%!error <... strcmp:.*> strcmp ("foo", "bar", 3);
+%!error <Invalid call to strcmp.*> strcmp ("foo", "bar", 3);
 
 %% test/octave.test/string/bin2dec-1.m
 %!assert(bin2dec ("1110") == 14);
@@ -343,10 +343,10 @@
 %! "abc\\a\\b\\n\\r\\t\\v\\f123"));
 
 %% test/octave.test/string/undo_string_escapes-2.m
-%!error <... undo_string_escapes:.*> undo_string_escapes ();
+%!error <Invalid call to undo_string_escapes.*> undo_string_escapes ();
 
 %% test/octave.test/string/undo_string_escapes-3.m
-%!error <... undo_string_escapes:.*> undo_string_escapes ("string", 2);
+%!error <Invalid call to undo_string_escapes.*> undo_string_escapes ("string", 2);
 
 %% test/octave.test/string/toascii-1.m
 %!test
diff --git a/test/test_struct.m b/test/test_struct.m
--- a/test/test_struct.m
+++ b/test/test_struct.m
@@ -13,12 +13,12 @@
 %! assert(iscell (c) && strcmp (c{1}, "b"));
 
 %% test/octave.test/struct/fieldnames-3.m
-%!error <... fieldnames:.*> fieldnames ();
+%!error <Invalid call to fieldnames.*> fieldnames ();
 
 %% test/octave.test/struct/fieldnames-4.m
 %!test
 %! s.a = 1;
-%! fail("fieldnames (s, 1)","eldnames:.*");
+%! fail("fieldnames (s, 1)","Invalid call to fieldnames.*");
 
 %% test/octave.test/struct/fieldnames-5.m
 %!error fieldnames (1);
@@ -36,13 +36,13 @@
 %! assert(!(isfield (s, "b")));
 
 %% test/octave.test/struct/isfield-3.m
-%!error <... isfield:.*> isfield ();
+%!error <Invalid call to isfield.*> isfield ();
 
 %% test/octave.test/struct/isfield-4.m
 %!test
 %! s.aaa = 1;
 %! s.a = 2;
-%! fail("isfield (s, 'a', 3);","field:.*");
+%! fail("isfield (s, 'a', 3);","Invalid call to isfield.*");
 
 %% test/octave.test/struct/isfield-5.m
 %!assert(isfield (1, "m") == 0);
@@ -84,10 +84,10 @@
 %! assert(isstruct (s.a));
 
 %% test/octave.test/struct/isstruct-10.m
-%!error <... isstruct:.*> isstruct ();
+%!error <Invalid call to isstruct.*> isstruct ();
 
 %% test/octave.test/struct/isstruct-11.m
 %!test
 %! s.a = 1;
-%! fail("isstruct (s, 1)","struct:.*");
+%! fail("isstruct (s, 1)","Invalid call to isstruct.*");
 
diff --git a/test/test_system.m b/test/test_system.m
--- a/test/test_system.m
+++ b/test/test_system.m
@@ -30,10 +30,10 @@
 %! && struct_contains (ts, "yday")));
 
 %% test/octave.test/system/gmtime-2.m
-%!error <... gmtime:.*> gmtime ();
+%!error <Invalid call to gmtime.*> gmtime ();
 
 %% test/octave.test/system/gmtime-3.m
-%!error <... gmtime:.*> gmtime (1, 2);
+%!error <Invalid call to gmtime.*> gmtime (1, 2);
 
 %% test/octave.test/system/localtime-1.m
 %!test
@@ -51,10 +51,10 @@
 %! && struct_contains (ts, "yday")));
 
 %% test/octave.test/system/localtime-2.m
-%!error <... localtime:.*> localtime ();
+%!error <Invalid call to localtime.*> localtime ();
 
 %% test/octave.test/system/localtime-3.m
-%!error <... localtime:.*> localtime (1, 2);
+%!error <Invalid call to localtime.*> localtime (1, 2);
 
 %% test/octave.test/system/mktime-1.m
 %!test
@@ -62,10 +62,10 @@
 %! assert(fix (mktime (localtime (t))) == fix (t));
 
 %% test/octave.test/system/mktime-2.m
-%!error <... mktime:.*> mktime ();
+%!error <Invalid call to mktime.*> mktime ();
 
 %% test/octave.test/system/mktime-3.m
-%!error <... mktime:.*> mktime (1, 2, 3);
+%!error <Invalid call to mktime.*> mktime (1, 2, 3);
 
 %% test/octave.test/system/asctime-1.m
 %!test
@@ -86,10 +86,10 @@
 %! && isstr (strftime ("%m%U%w%W%x%y%Y", localtime (time ())))));
 
 %% test/octave.test/system/strftime-2.m
-%!error <... strftime:.*> strftime ();
+%!error <Invalid call to strftime.*> strftime ();
 
 %% test/octave.test/system/strftime-3.m
-%!error <... strftime:.*> strftime ("foo", localtime (time ()), 1);
+%!error <Invalid call to strftime.*> strftime ("foo", localtime (time ()), 1);
 
 %% test/octave.test/system/clock-1.m
 %!test
@@ -147,7 +147,7 @@
 %! assert(prog_output_assert("ok"));
 
 %% test/octave.test/system/pause-2.m
-%!error <... pause:.*> pause (1, 2);
+%!error <Invalid call to pause.*> pause (1, 2);
 
 %% test/octave.test/system/sleep-1.m
 %!test
@@ -156,10 +156,10 @@
 %! assert(prog_output_assert("ok"));
 
 %% test/octave.test/system/sleep-2.m
-%!error <... sleep:.*> sleep ();
+%!error <Invalid call to sleep.*> sleep ();
 
 %% test/octave.test/system/sleep-3.m
-%!error <... sleep:.*> sleep (1, 2);
+%!error <Invalid call to sleep.*> sleep (1, 2);
 
 %% test/octave.test/system/usleep-1.m
 %!test
@@ -168,10 +168,10 @@
 %! assert(prog_output_assert("ok"));
 
 %% test/octave.test/system/usleep-2.m
-%!error <... usleep:.*> usleep ();
+%!error <Invalid call to usleep.*> usleep ();
 
 %% test/octave.test/system/usleep-3.m
-%!error <... usleep:.*> usleep (1, 2);
+%!error <Invalid call to usleep.*> usleep (1, 2);
 
 %% test/octave.test/system/rename-1.m
 %!test
@@ -193,10 +193,10 @@
 %! endif
 
 %% test/octave.test/system/rename-2.m
-%!error <... rename:.*> rename ();
+%!error <Invalid call to rename.*> rename ();
 
 %% test/octave.test/system/rename-3.m
-%!error <... rename:.*> rename ("foo", "bar", 1);
+%!error <Invalid call to rename.*> rename ("foo", "bar", 1);
 
 %% test/octave.test/system/unlink-1.m
 %!test
@@ -210,10 +210,10 @@
 %! endif
 
 %% test/octave.test/system/unlink-2.m
-%!error <... unlink:.*> unlink ();
+%!error <Invalid call to unlink.*> unlink ();
 
 %% test/octave.test/system/unlink-3.m
-%!error <... unlink:.*> unlink ("foo", 1);
+%!error <Invalid call to unlink.*> unlink ("foo", 1);
 
 %% test/octave.test/system/readdir-1.m
 %!test
@@ -221,10 +221,10 @@
 %! assert(iscell (files) && status == 0 && msg == "");
 
 %% test/octave.test/system/readdir-2.m
-%!error <... readdir:.*> readdir ();
+%!error <Invalid call to readdir.*> readdir ();
 
 %% test/octave.test/system/readdir-3.m
-%!error <... readdir:.*> readdir ("foo", 1);
+%!error <Invalid call to readdir.*> readdir ("foo", 1);
 
 %% test/octave.test/system/mk-rm-dir-1.m
 %!test
@@ -236,13 +236,13 @@
 %! assert((e1 && strcmp (s2.modestr(1), "d") && e3 && e4 < 0));
 
 %% test/octave.test/system/mkdir-1.m
-%!error <... mkdir:.*> mkdir ();
+%!error <Invalid call to mkdir.*> mkdir ();
 
 %% test/octave.test/system/mkdir-2.m
-%!error <... mkdir:.*> mkdir ("foo", 1);
+%!error <Invalid call to mkdir.*> mkdir ("foo", 1);
 
 %% test/octave.test/system/rmdir-1.m
-%!error <... rmdir:.*> rmdir ();
+%!error <Invalid call to rmdir.*> rmdir ();
 
 %% test/octave.test/system/rmdir-2.m
 %!test
@@ -271,10 +271,10 @@
 %! assert(strcmp (s1.modestr, "-rw-rw-rw-") && strcmp (s2.modestr, "----------"));
 
 %% test/octave.test/system/umask-2.m
-%!error <... umask:.*> umask ();
+%!error <Invalid call to umask.*> umask ();
 
 %% test/octave.test/system/umask-3.m
-%!error <... umask:.*> umask (1, 2);
+%!error <Invalid call to umask.*> umask (1, 2);
 
 %% test/octave.test/system/stat-1.m
 %!test
@@ -294,10 +294,10 @@
 %! && isstr (msg)));
 
 %% test/octave.test/system/stat-2.m
-%!error <... stat:.*> stat ();
+%!error <Invalid call to stat.*> stat ();
 
 %% test/octave.test/system/stat-3.m
-%!error <... stat:.*> stat ("foo", 1);
+%!error <Invalid call to stat.*> stat ("foo", 1);
 
 %% test/octave.test/system/lstat-1.m
 %!test
@@ -317,19 +317,19 @@
 %! && isstr (msg)));
 
 %% test/octave.test/system/lstat-2.m
-%!error <... lstat:.*> lstat ();
+%!error <Invalid call to lstat.*> lstat ();
 
 %% test/octave.test/system/lstat-3.m
-%!error <... lstat:.*> lstat ("foo", 1);
+%!error <Invalid call to lstat.*> lstat ("foo", 1);
 
 %% test/octave.test/system/glob-1.m
 %!assert(iscell (glob ([filesep "*"])));
 
 %% test/octave.test/system/glob-2.m
-%!error <... glob:*> glob ();
+%!error <Invalid call to glob*> glob ();
 
 %% test/octave.test/system/glob-3.m
-%!error <... glob:.*> glob ("foo", 1);
+%!error <Invalid call to glob.*> glob ("foo", 1);
 
 %% test/octave.test/system/fnmatch-1.m
 %!test
@@ -341,10 +341,10 @@
 %! && fnmatch ("x???y", {"xabcy"; "xy"}) == [1; 0]));
 
 %% test/octave.test/system/fnmatch-2.m
-%!error <... fnmatch:.*> fnmatch ();
+%!error <Invalid call to fnmatch.*> fnmatch ();
 
 %% test/octave.test/system/fnmatch-3.m
-%!error <... fnmatch:.*> fnmatch ("foo", "bar", 3);
+%!error <Invalid call to fnmatch.*> fnmatch ("foo", "bar", 3);
 
 %% test/octave.test/system/file_in_path-1.m
 %!assert(isstr (file_in_path (LOADPATH, "date.m")));
@@ -353,10 +353,10 @@
 %!error <invalid option> file_in_path ("foo", "bar", 1);
 
 %% test/octave.test/system/file_in_path-3.m
-%!error <... 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 <... 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
 %!test
@@ -366,10 +366,10 @@
 %! && strcmp ("foobar", tilde_expand ("foobar"))));
 
 %% test/octave.test/system/tilde_expand-2.m
-%!error <... tilde_expand:.*> tilde_expand ();
+%!error <Invalid call to tilde_expand.*> tilde_expand ();
 
 %% test/octave.test/system/tilde_expand-3.m
-%!error <... tilde_expand:.*> tilde_expand ("str", 2);
+%!error <Invalid call to tilde_expand.*> tilde_expand ("str", 2);
 
 %% test/octave.test/system/getpgrp-1.m
 %!assert(getpgrp () > 0);
@@ -417,10 +417,10 @@
 %!assert(strcmp (getenv ("HOME"), tilde_expand ("~")));
 
 %% test/octave.test/system/getenv-2.m
-%!error <... getenv:.*> getenv ();
+%!error <Invalid call to getenv.*> getenv ();
 
 %% test/octave.test/system/getenv-3.m
-%!error <... getenv:.*> getenv ("foo", 1);
+%!error <Invalid call to getenv.*> getenv ("foo", 1);
 
 %% test/octave.test/system/getenv-4.m
 %!test
@@ -435,10 +435,10 @@
 %! assert(strcmp (getenv ("foobar"), "baz"));
 
 %% test/octave.test/system/putenv-2.m
-%!error <... putenv:.*> putenv ();
+%!error <Invalid call to putenv.*> putenv ();
 
 %% test/octave.test/system/putenv-3.m
-%!error <... putenv:.*> putenv ("foo", "bar", 1);
+%!error <Invalid call to putenv.*> putenv ("foo", "bar", 1);
 
 %% test/octave.test/system/putenv-4.m
 %!test
@@ -479,7 +479,7 @@
 %! && struct_contains (s, "shell")));
 
 %% test/octave.test/system/getpwent-2.m
-%!error <... getpwent:.*> getpwent (1);
+%!error <Invalid call to getpwent.*> getpwent (1);
 
 %% test/octave.test/system/getpwuid-1.m
 %!test
@@ -489,10 +489,10 @@
 %! assert(strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid);
 
 %% test/octave.test/system/getpwuid-2.m
-%!error <... getpwuid:.*> getpwuid ();
+%!error <Invalid call to getpwuid.*> getpwuid ();
 
 %% test/octave.test/system/getpwuid-3.m
-%!error <... getpwuid:.*> getpwuid (1, 2);
+%!error <Invalid call to getpwuid.*> getpwuid (1, 2);
 
 %% test/octave.test/system/getpwnam-1.m
 %!test
@@ -502,10 +502,10 @@
 %! assert(strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid);
 
 %% test/octave.test/system/getpwnam-2.m
-%!error <... getpwnam:.*> getpwnam ();
+%!error <Invalid call to getpwnam.*> getpwnam ();
 
 %% test/octave.test/system/getpwnam-3.m
-%!error <... getpwnam:.*> getpwnam ("foo", 1);
+%!error <Invalid call to getpwnam.*> getpwnam ("foo", 1);
 
 %% test/octave.test/system/setpwent-1.m
 %!test
@@ -516,10 +516,10 @@
 %! assert(strcmp (x.name, y.name) && x.uid == y.uid && x.gid == y.gid);
 
 %% test/octave.test/system/setpwent-2.m
-%!error <... setpwent:.*> setpwent (1);
+%!error <Invalid call to setpwent.*> setpwent (1);
 
 %% test/octave.test/system/endpwent-1.m
-%!error <... endpwent:.*> endpwent (1);
+%!error <Invalid call to endpwent.*> endpwent (1);
 
 %% test/octave.test/system/getgrent-1.m
 %!test
@@ -532,7 +532,7 @@
 %! && struct_contains (x, "mem")));
 
 %% test/octave.test/system/getgrent-2.m
-%!error <... getgrent:.*> getgrent (1);
+%!error <Invalid call to getgrent.*> getgrent (1);
 
 %% test/octave.test/system/getgrgid-1.m
 %!test
@@ -542,10 +542,10 @@
 %! assert(strcmp (x.name, y.name) && x.gid == y.gid);
 
 %% test/octave.test/system/getgrgid-2.m
-%!error <... getgrgid:.*> getgrgid ();
+%!error <Invalid call to getgrgid.*> getgrgid ();
 
 %% test/octave.test/system/getgrgid-3.m
-%!error <... getgrgid:.*> getgrgid (1, 2);
+%!error <Invalid call to getgrgid.*> getgrgid (1, 2);
 
 %% test/octave.test/system/getgrnam-1.m
 %!test
@@ -555,10 +555,10 @@
 %! assert(strcmp (x.name, y.name) && x.gid == y.gid);
 
 %% test/octave.test/system/getgrnam-2.m
-%!error <... getgrnam:.*> getgrnam ();
+%!error <Invalid call to getgrnam.*> getgrnam ();
 
 %% test/octave.test/system/getgrnam-3.m
-%!error <... getgrnam:.*> getgrnam ("foo", 1);
+%!error <Invalid call to getgrnam.*> getgrnam ("foo", 1);
 
 %% test/octave.test/system/setgrent-1.m
 %!test
@@ -569,10 +569,10 @@
 %! assert(strcmp (x.name, y.name) && x.gid == y.gid);
 
 %% test/octave.test/system/setgrent-2.m
-%!error <... setgrent:.*> setgrent (1);
+%!error <Invalid call to setgrent.*> setgrent (1);
 
 %% test/octave.test/system/endgrent-1.m
-%!error <... endgrent:.*> endgrent (1);
+%!error <Invalid call to endgrent.*> endgrent (1);
 
 %% test/octave.test/system/computer-1.m
 %!assert((isstr (computer ())