Merge remote-tracking branch 'origin/YaSp' into richelieu-vmkit

diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_11618.dia.ref b/scilab/modules/sparse/tests/nonreg_tests/bug_11618.dia.ref
index ceffb94..9aa0846 100644 (file)
--- a/scilab/modules/sparse/tests/nonreg_tests/bug_11618.dia.ref
+++ b/scilab/modules/sparse/tests/nonreg_tests/bug_11618.dia.ref
@@ -12,11 +12,7 @@
 //
 // <-- Short Description -->
 //    if A is a complex sparse matrix, A(:) returned wrong values
-A = [0 %i;1 2]
- A  =
- 
-    0     i    
-    1.    2.   
+A = [0 %i;1 2];
 A1 = sparse(A);
 assert_checkequal(full(A1(:)), A(:));
 A = [1 0; 3 %i];

diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_11618.tst b/scilab/modules/sparse/tests/nonreg_tests/bug_11618.tst
index a085828..be7afb9 100644 (file)
--- a/scilab/modules/sparse/tests/nonreg_tests/bug_11618.tst
+++ b/scilab/modules/sparse/tests/nonreg_tests/bug_11618.tst
@@ -15,7 +15,7 @@
 // <-- Short Description -->\r
 //    if A is a complex sparse matrix, A(:) returned wrong values\r
 \r
-A = [0 %i;1 2]\r
+A = [0 %i;1 2];\r
 A1 = sparse(A);\r
 assert_checkequal(full(A1(:)), A(:));\r
 \r