sparse: make tests pass

Change-Id: I6cea469b850c8f1e8bbb8ba4c236fe74b8cee457

diff --git a/scilab/modules/sparse/sci_gateway/cpp/sci_spzeros.cpp b/scilab/modules/sparse/sci_gateway/cpp/sci_spzeros.cpp
index 3b914c4..e615934 100644 (file)
--- a/scilab/modules/sparse/sci_gateway/cpp/sci_spzeros.cpp
+++ b/scilab/modules/sparse/sci_gateway/cpp/sci_spzeros.cpp
@@ -92,7 +92,7 @@ types::Function::ReturnValue sci_spzeros(types::typed_list &in, int _iRetCount,
         }
         if (dblCols != (double) ((unsigned int) dblCols))
         {
-            Scierror(999, _("%s: Wrong value for input argument #%d: Scalar positive integer expected.\n"), "spzeros", 1);
+            Scierror(999, _("%s: Wrong value for input argument #%d: Scalar positive integer expected.\n"), "spzeros", 2);
             return types::Function::Error;
         }
 

diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_15647.tst b/scilab/modules/sparse/tests/nonreg_tests/bug_15647.tst
index d5ac3f3..e49f975 100644 (file)
--- a/scilab/modules/sparse/tests/nonreg_tests/bug_15647.tst
+++ b/scilab/modules/sparse/tests/nonreg_tests/bug_15647.tst
@@ -16,6 +16,6 @@
 // <-- Short Description -->
 // spzeros(-1,-1) yields a corrupted result
 
-errMsg = _("%s: Wrong value for input argument #%d: Scalar positive integer expected.\n")
+errMsg = _("%s: Wrong value for input argument #%d: Scalar positive integer expected.")
 assert_checkerror("spzeros(-1,-1)", msprintf(errMsg, "spzeros", 1));
 assert_checkerror("spzeros(1,-1)", msprintf(errMsg, "spzeros", 2));

diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_490.dia.ref b/scilab/modules/sparse/tests/nonreg_tests/bug_490.dia.ref
deleted file mode 100644 (file)
index e83ea7f..0000000
--- a/scilab/modules/sparse/tests/nonreg_tests/bug_490.dia.ref
+++ /dev/null
@@ -1,19 +0,0 @@
-// ============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
-//
-//  This file is distributed under the same license as the Scilab package.
-// ============================================================================
-// <-- CLI SHELL MODE -->
-// <-- Non-regression test for bug 490 -->
-// Please note that it is store under the request feature of Scilab
-// 
-// <-- Bugzilla URL -->
-// http://requestzilla.scilab.org/show_bug.cgi?id=490
-//
-// <-- Short Description -->
-//    Wrong size detection in sparse matrix
-toto = spzeros(2^16, 2^16);
-toto(1, 8) =toto(1, 8)+5;
-toto(1, 8) =toto(1, 8)+5;
-if toto(1, 8) == []; then bugmes();quit;end

diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_490.tst b/scilab/modules/sparse/tests/nonreg_tests/bug_490.tst
index c7e1ceb..995acc5 100644 (file)
--- a/scilab/modules/sparse/tests/nonreg_tests/bug_490.tst
+++ b/scilab/modules/sparse/tests/nonreg_tests/bug_490.tst
@@ -6,10 +6,11 @@
 // ============================================================================
 
 // <-- CLI SHELL MODE -->
+// <-- NO CHECK REF -->
 
 // <-- Non-regression test for bug 490 -->
 // Please note that it is store under the request feature of Scilab
-// 
+//
 // <-- Bugzilla URL -->
 // http://requestzilla.scilab.org/show_bug.cgi?id=490
 //
@@ -17,7 +18,7 @@
 //    Wrong size detection in sparse matrix
 
 toto = spzeros(2^16, 2^16);
-toto(1, 8) =toto(1, 8)+5;
-toto(1, 8) =toto(1, 8)+5;
-if toto(1, 8) == []; then pause, end
+toto(1, 8) = toto(1, 8)+5;
+toto(1, 8) = toto(1, 8)+5;
+assert_checkequal(toto(1, 8), sparse([1,1], 10));