# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1213211146 14400
# Node ID 3092dd54ad95cb372e2f4e41fe86cf2d228ec51d
# Parent  4816cec8b1ca198c0d78f4142b8a99598150ac8d
fix expected output from lasterr in tests; fix fail tests in ismember.m

diff -r 4816cec8b1ca -r 3092dd54ad95 scripts/ChangeLog
--- a/scripts/ChangeLog	Wed Jun 11 14:39:21 2008 -0400
+++ b/scripts/ChangeLog	Wed Jun 11 15:05:46 2008 -0400
@@ -1,5 +1,7 @@
 2008-06-11  John W. Eaton  <jwe@octave.org>
 
+	* set/ismember.m: Fix fail tests.
+
 	* general/rat.m: Properly initialize steps when all elements of
 	input array are integers.  Append spaces as necessary when
 	building  character array.
diff -r 4816cec8b1ca -r 3092dd54ad95 scripts/set/ismember.m
--- a/scripts/set/ismember.m	Wed Jun 11 14:39:21 2008 -0400
+++ b/scripts/set/ismember.m	Wed Jun 11 15:05:46 2008 -0400
@@ -241,13 +241,13 @@
 %!assert (isempty (ismember ([], [1, 2])), true);
 %!assert (isempty (ismember ({}, {'a', 'b'})), true);
 %!assert (ismember ('', {'abc', 'def'}), false);
-%!fail ('ismember ([], {1, 2})', 'error:.*');
-%!fail ('ismember ({[]}, {1, 2})', 'error:.*');
-%!fail ('ismember ({}, {1, 2})', 'error:.*');
-%!fail ('ismember ({1}, {''1'', ''2''})', 'error:.*');
-%!fail ('ismember (1, ''abc'')', 'error:.*');
-%!fail ('ismember ({''1''}, {''1'', ''2''},''rows'')', 'error:.*');
-%!fail ('ismember ([1 2 3], [5 4 3 1], ''rows'')', 'error:.*');
+%!fail ('ismember ([], {1, 2})');
+%!fail ('ismember ({[]}, {1, 2})');
+%!fail ('ismember ({}, {1, 2})');
+%!fail ('ismember ({1}, {''1'', ''2''})');
+%!fail ('ismember (1, ''abc'')');
+%!fail ('ismember ({''1''}, {''1'', ''2''},''rows'')');
+%!fail ('ismember ([1 2 3], [5 4 3 1], ''rows'')');
 %!assert (ismember ({'foo', 'bar'}, {'foobar'}), logical ([0, 0]));
 %!assert (ismember ({'foo'}, {'foobar'}), false);
 %!assert (ismember ({'bar'}, {'foobar'}), false);
diff -r 4816cec8b1ca -r 3092dd54ad95 test/ChangeLog
--- a/test/ChangeLog	Wed Jun 11 14:39:21 2008 -0400
+++ b/test/ChangeLog	Wed Jun 11 15:05:46 2008 -0400
@@ -1,3 +1,7 @@
+2008-06-11  John W. Eaton  <jwe@octave.org>
+
+	* test_eval-catch.m, test_try.m: Fix expected output from lasterr.
+
 2008-06-02  David Bateman  <dbateman@free.fr>
 
 	* test_arith.m: Delete and move tests close to function
diff -r 4816cec8b1ca -r 3092dd54ad95 test/test_eval-catch.m
--- a/test/test_eval-catch.m	Wed Jun 11 14:39:21 2008 -0400
+++ b/test/test_eval-catch.m	Wed Jun 11 15:05:46 2008 -0400
@@ -37,14 +37,14 @@
 %% test/octave.test/eval-catch/eval-catch-5.m
 %!test
 %! eval ("clear a; a; str = '';", "str=lasterr;");
-%! assert(lasterr()(1:20),"error: `a' undefined");
-%! assert(str(1:20),"error: `a' undefined");
+%! assert(lasterr()(1:13),"`a' undefined");
+%! assert(str(1:13),"`a' undefined");
 
 %% test/octave.test/eval-catch/eval-catch-6.m
 %!test
 %! eval ("error (\"user-defined error\"); str = '';", "str = lasterr;");
-%! assert(lasterr()(1:25),"error: user-defined error");
-%! assert(str(1:25),"error: user-defined error");
+%! assert(lasterr()(1:18),"user-defined error");
+%! assert(str(1:18),"user-defined error");
 
 %% test/octave.test/eval-catch/eval-catch-7.m
 %!function ms = mangle (s)
@@ -52,25 +52,25 @@
 %!  ms = cstrcat ("<", s, ">");
 %!test
 %! eval ("clear a; a; str='';", "str = mangle (lasterr);");
-%! assert(mangle(lasterr)(1:21),"<error: `a' undefined");
-%! assert(str(1:21),"<error: `a' undefined");
+%! assert(mangle(lasterr)(1:14),"<`a' undefined");
+%! assert(str(1:14),"<`a' undefined");
 
 %% test/octave.test/eval-catch/eval-catch-8.m
 %!test
 %! eval ("eval (\"clear a; a;str1='';\", \"str1=lasterr;\"); clear b; b; str2='';",
 %! "str2 = lasterr;");
-%! assert(str1(1:20),"error: `a' undefined");
-%! assert(str2(1:20),"error: `b' undefined");
+%! assert(str1(1:13),"`a' undefined");
+%! assert(str2(1:13),"`b' undefined");
 
 %% test/octave.test/eval-catch/eval-catch-9.m
 %!test
 %! eval ("clear a; a; str1='';",
 %! "eval (\"clear b; b; str2='';\", \"str2=lasterr;\"); str1=lasterr;");
-%! assert(str1(1:20),"error: `b' undefined");
-%! assert(str2(1:20),"error: `b' undefined");
+%! assert(str1(1:13),"`b' undefined");
+%! assert(str2(1:13),"`b' undefined");
 
 %% test/octave.test/eval-catch/eval-catch-10.m
 %!test
 %! eval ("eval (\"clear a; a; str='';\",\"error (cstrcat (\\\"rethrow: \\\", lasterr));str='';\");",
 %! "str=lasterr;");
-%! assert(str(1:36),"error: rethrow: error: `a' undefined");
+%! assert(str(1:22),"rethrow: `a' undefined");
diff -r 4816cec8b1ca -r 3092dd54ad95 test/test_try.m
--- a/test/test_try.m	Wed Jun 11 14:39:21 2008 -0400
+++ b/test/test_try.m	Wed Jun 11 15:05:46 2008 -0400
@@ -65,16 +65,16 @@
 %!   a;
 %!   error("Shoudn't get here");
 %! catch
-%!   assert (strcmp(lasterr()(1:20), "error: `a' undefined"))
+%!   assert (strcmp(lasterr()(1:13), "`a' undefined"))
 %! end_try_catch
-%! assert (strcmp(lasterr()(1:20), "error: `a' undefined"))
+%! assert (strcmp(lasterr()(1:13), "`a' undefined"))
 
 %% test/octave.test/try/try-6.m
 %!test 
 %! try
 %!   error ("user-defined error")
 %! catch
-%!   assert(lasterr,"error: user-defined error\n");
+%!   assert(lasterr,"user-defined error");
 %! end_try_catch
 
 %% test/octave.test/try/try-7.m
@@ -87,7 +87,7 @@
 %!   a;
 %!   error("Shoudn't get here");
 %! catch
-%!   assert(strcmp(mangle (lasterr)(1:21),"<error: `a' undefined"))
+%!   assert(strcmp(mangle (lasterr)(1:14),"<`a' undefined"))
 %! end_try_catch
 
 
@@ -99,13 +99,13 @@
 %!     a;
 %!     error("Shoudn't get here");
 %!   catch
-%!     assert(strcmp(lasterr()(1:20), "error: `a' undefined"))
+%!     assert(strcmp(lasterr()(1:13), "`a' undefined"))
 %!   end_try_catch
 %!   clear b
 %!   b;
 %!   error("Shoudn't get here");
 %! catch
-%!   assert(strcmp(lasterr()(1:20), "error: `b' undefined"))
+%!   assert(strcmp(lasterr()(1:13), "`b' undefined"))
 %! end_try_catch
 
 %% test/octave.test/try/try-9.m
@@ -116,12 +116,12 @@
 %!   error("Shoudn't get here");
 %! catch
 %!   try
-%!     assert(strcmp(lasterr()(1:20), "error: `a' undefined"))
+%!     assert(strcmp(lasterr()(1:13), "`a' undefined"))
 %!     clear b
 %!     b;
 %!     error("Shoudn't get here");
 %!   catch
-%!     assert(strcmp(lasterr()(1:20), "error: `b' undefined"))
+%!     assert(strcmp(lasterr()(1:13), "`b' undefined"))
 %!   end_try_catch
 %! end_try_catch
 
@@ -136,6 +136,6 @@
 %!     error(cstrcat("rethrow: ",lasterr));
 %!   end_try_catch
 %! catch
-%!   assert(strcmp(lasterr()(1:36), "error: rethrow: error: `a' undefined"))
+%!   assert(strcmp(lasterr()(1:22), "rethrow: `a' undefined"))
 %! end_try_catch