# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1326303304 18000
# Node ID 20ab93491f83054f22807c57ac9793191216a51c
# Parent  72aebe6196414e38ef802469ff6e238f914f04c9# Parent  68fd9f95e1f92b82edf649ff8d6ba6ca2c2c9a10
merge changes made for release that were not immediately pushed to savannah

diff -r 72aebe619641 -r 20ab93491f83 scripts/testfun/test.m
--- a/scripts/testfun/test.m	Tue Jan 10 16:43:41 2012 -0500
+++ b/scripts/testfun/test.m	Wed Jan 11 12:35:04 2012 -0500
@@ -457,7 +457,9 @@
 
     elseif (strcmp (__type, "testif"))
       __e = regexp (__code, '.$', 'lineanchors', 'once');
-      __feat = regexp (__code(1:__e), '\w+', 'match');
+      ## Strip comment any comment from testif line before looking for features
+      __feat_line = strtok (__code(1:__e), '#%'); 
+      __feat = regexp (__feat_line, '\w+', 'match');
       __have_feat = strfind (octave_config_info ("DEFS"), __feat); 
       if (any (cellfun ("isempty", __have_feat)))
         __xskip++;
diff -r 72aebe619641 -r 20ab93491f83 src/oct-parse.yy
--- a/src/oct-parse.yy	Tue Jan 10 16:43:41 2012 -0500
+++ b/src/oct-parse.yy	Wed Jan 11 12:35:04 2012 -0500
@@ -1899,8 +1899,6 @@
   tree_expression *op1 = e->lhs ();
   tree_expression *op2 = e->rhs ();
 
-  octave_value::binary_op op_type = e->op_type ();
-
   if (op1->is_constant () && op2->is_constant ())
     {
       octave_value tmp = e->rvalue1 ();
diff -r 72aebe619641 -r 20ab93491f83 test/build_sparse_tests.sh
--- a/test/build_sparse_tests.sh	Tue Jan 10 16:43:41 2012 -0500
+++ b/test/build_sparse_tests.sh	Wed Jan 11 12:35:04 2012 -0500
@@ -646,11 +646,11 @@
 %! assert (l, sparse ([1,2,2],[1,1,2],1), 10*eps);
 %! assert (u, sparse ([1,1,2],[1,2,2],[1,1,1i]), 10*eps);
 
-%!testif HAVE_UMFPACK ;# permuted LU
+%!testif HAVE_UMFPACK   # permuted LU
 %! [L,U] = lu (bs);
 %! assert (L*U, bs, 1e-10);
 
-%!testif HAVE_UMFPACK ;# simple LU + row permutations
+%!testif HAVE_UMFPACK   # simple LU + row permutations
 %! [L,U,P] = lu (bs);
 %! assert (P'*L*U, bs, 1e-10);
 %! # triangularity
@@ -659,7 +659,7 @@
 %! [i,j,v] = find (U);
 %! assert (j-i>=0);
 
-%!testif HAVE_UMFPACK ;# simple LU + row/col permutations
+%!testif HAVE_UMFPACK   # simple LU + row/col permutations
 %! [L,U,P,Q] = lu (bs);
 %! assert (P'*L*U*Q', bs, 1e-10);
 %! # triangularity
@@ -668,7 +668,7 @@
 %! [i,j,v] = find (U);
 %! assert (j-i>=0);
 
-%!testif HAVE_UMFPACK ;# LU with vector permutations
+%!testif HAVE_UMFPACK   # LU with vector permutations
 %! [L,U,P,Q] = lu (bs,'vector');
 %! assert (L(P,:)*U(:,Q), bs, 1e-10);
 %! # triangularity
@@ -677,7 +677,7 @@
 %! [i,j,v] = find (U);
 %! assert (j-i>=0);
 
-%!testif HAVE_UMFPACK ;# LU with scaling
+%!testif HAVE_UMFPACK   # LU with scaling
 %! [L,U,P,Q,R] = lu (bs);
 %! assert (R*P'*L*U*Q', bs, 1e-10);
 %! # triangularity
@@ -686,7 +686,7 @@
 %! [i,j,v] = find (U);
 %! assert (j-i>=0);
 
-%!testif HAVE_UMFPACK ;# inverse
+%!testif HAVE_UMFPACK   # inverse
 %! assert (inv (bs)*bs, sparse (eye (rows (bs))), 1e-10);
 
 %!assert (bf\as', bf\af', 100*eps);
@@ -706,7 +706,7 @@
 %!testif HAVE_CHOLMOD
 %! assert (chol (bs,'lower'), chol (bs)', 1e-10);
 
-%!testif HAVE_CHOLMOD ;# Return Partial Cholesky factorization
+%!testif HAVE_CHOLMOD   # Return Partial Cholesky factorization
 %! [RS,PS] = chol (bs);
 %! assert (RS'*RS, bs, 1e-10);
 %! assert (PS, 0);
@@ -714,7 +714,7 @@
 %! assert (LS*LS', bs, 1e-10);
 %! assert (PS, 0);
 
-%!testif HAVE_CHOLMOD ;# Permuted Cholesky factorization
+%!testif HAVE_CHOLMOD   # Permuted Cholesky factorization
 %! [RS,PS,QS] = chol (bs);
 %! assert (RS'*RS, QS*bs*QS', 1e-10);
 %! assert (PS, 0);
@@ -750,11 +750,11 @@
     gen_matrixdiag_tests
     gen_matrixreshape_tests
     cat >>$TESTS <<EOF
-%!testif HAVE_UMFPACK ;# permuted LU
+%!testif HAVE_UMFPACK   # permuted LU
 %! [L,U] = lu (bs);
 %! assert (L*U, bs, 1e-10);
 
-%!testif HAVE_UMFPACK ;# simple LU + row permutations
+%!testif HAVE_UMFPACK   # simple LU + row permutations
 %! [L,U,P] = lu (bs);
 %! assert (P'*L*U, bs, 1e-10);
 %! # triangularity
@@ -763,7 +763,7 @@
 %! [i,j,v] = find (U);
 %! assert (j-i>=0);
 
-%!testif HAVE_UMFPACK ;# simple LU + row/col permutations
+%!testif HAVE_UMFPACK   # simple LU + row/col permutations
 %! [L,U,P,Q] = lu (bs);
 %! assert (P'*L*U*Q', bs, 1e-10);
 %! # triangularity
@@ -772,7 +772,7 @@
 %! [i,j,v] = find (U);
 %! assert (j-i>=0);
 
-%!testif HAVE_UMFPACK ;# LU with vector permutations
+%!testif HAVE_UMFPACK   # LU with vector permutations
 %! [L,U,P,Q] = lu (bs,'vector');
 %! assert (L (P,:)*U (:,Q), bs, 1e-10);
 %! # triangularity
@@ -781,7 +781,7 @@
 %! [i,j,v] = find (U);
 %! assert (j-i>=0);
 
-%!testif HAVE_UMFPACK ;# LU with scaling
+%!testif HAVE_UMFPACK   # LU with scaling
 %! [L,U,P,Q,R] = lu (bs);
 %! assert (R*P'*L*U*Q', bs, 1e-10);
 %! # triangularity
@@ -930,7 +930,7 @@
 %! load (savefile, "as_save");
 %! unlink (savefile);
 %! assert (as_save, sparse(af));
-%!testif HAVE_HDF5 # save hdf5
+%!testif HAVE_HDF5   # save hdf5
 %! savefile = tmpnam ();
 %! as_save = as;
 %! save ("-hdf5", savefile, "bf", "as_save", "af");