summaryrefslogtreecommitdiffstats
path: root/scilab/modules/data_structures
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2009-12-11 16:07:06 +0100
committerClément DAVID <clement.david@scilab.org>2009-12-11 16:07:06 +0100
commitba5bc45dfdd7d5b37e40419464631522d484404c (patch)
tree3708d59283d177e23464b146dc3925d70040ad2b /scilab/modules/data_structures
parent8685d80f751241f12dc709a3950e61490a4e7e24 (diff)
parent13cd430583f0f03c939900515955ebb8a92f2adb (diff)
downloadscilab-ba5bc45dfdd7d5b37e40419464631522d484404c.zip
scilab-ba5bc45dfdd7d5b37e40419464631522d484404c.tar.gz
Merge branch '5.2'
Diffstat (limited to 'scilab/modules/data_structures')
-rw-r--r--scilab/modules/data_structures/tests/nonreg_tests/bug_2588.dia.ref1
-rw-r--r--scilab/modules/data_structures/tests/nonreg_tests/bug_2588.tst2
2 files changed, 2 insertions, 1 deletions
diff --git a/scilab/modules/data_structures/tests/nonreg_tests/bug_2588.dia.ref b/scilab/modules/data_structures/tests/nonreg_tests/bug_2588.dia.ref
index d444692..f57669a 100644
--- a/scilab/modules/data_structures/tests/nonreg_tests/bug_2588.dia.ref
+++ b/scilab/modules/data_structures/tests/nonreg_tests/bug_2588.dia.ref
@@ -24,6 +24,7 @@ endfunction
24M.fun=foo; 24M.fun=foo;
25if M.fun()+1<>%s+1 then bugmes();quit;end 25if M.fun()+1<>%s+1 then bugmes();quit;end
26if M.fun(33)+1<>34 then bugmes();quit;end 26if M.fun(33)+1<>34 then bugmes();quit;end
27clear foo;
27function [x,y]=foo(a,b) 28function [x,y]=foo(a,b)
28 x=a*b 29 x=a*b
29 y=a-b 30 y=a-b
diff --git a/scilab/modules/data_structures/tests/nonreg_tests/bug_2588.tst b/scilab/modules/data_structures/tests/nonreg_tests/bug_2588.tst
index a13bc80..c71d2af 100644
--- a/scilab/modules/data_structures/tests/nonreg_tests/bug_2588.tst
+++ b/scilab/modules/data_structures/tests/nonreg_tests/bug_2588.tst
@@ -26,7 +26,7 @@ endfunction
26M.fun=foo; 26M.fun=foo;
27if M.fun()+1<>%s+1 then pause,end 27if M.fun()+1<>%s+1 then pause,end
28if M.fun(33)+1<>34 then pause,end 28if M.fun(33)+1<>34 then pause,end
29 29clear foo;
30function [x,y]=foo(a,b) 30function [x,y]=foo(a,b)
31 x=a*b 31 x=a*b
32 y=a-b 32 y=a-b